diff -r 1c8fca9ff3fb -r 27d9d356efbf symbian3/mw/appsupport/package_definition.xml
--- a/symbian3/mw/appsupport/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/appsupport/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,84 +1,184 @@
 <?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
->
-]>
+<!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="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
+        <collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
+          <component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
+          </component>
+          <component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_pub/network_status_api/group"/>
+          </component>
+        </collection>
+        <collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
+          <component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/action_plugin_api/group"/>
+          </component>
+          <component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/application_orientation_api/group"/>
+          </component>
+          <component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_access_api/group"/>
+          </component>
+          <component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
+          </component>
+          <component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
+          </component>
+          <component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
+          </component>
+          <component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
+          </component>
+          <component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
+          </component>
+          <component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
+          </component>
+          <component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/context_subscription_api/group"/>
+          </component>
+          <component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
+          </component>
+          <component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
+          </component>
+          <component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
+          </component>
+          <component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
+          </component>
+          <component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
+          </component>
+          <component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
+          </component>
+          <component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/operation_provider_api/group"/>
+          </component>
+          <component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
+          </component>
+          <component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
+          </component>
+          <component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
+          </component>
+          <component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
+          </component>
+          <component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
+          </component>
+          <component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
+          </component>
+          <component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
+          </component>
+          <component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
+          </component>
+          <component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
+          </component>
+          <component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
+          </component>
+          <component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
+          </component>
+          <component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
+          </component>
+          <component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
+          </component>
+        </collection>
         <collection name="contextframework" long-name="Context Framework" level="framework">
-          <!-- the units that are commented out need to be put back when configuration is in place.
+          <!-- the units that are commented out need to be put back when configuration is in place.
 		They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
           <component name="cfw" filter="s60" long-name="Context Framework">
             <!--<unit bldFile="contextframework/cfw/group"/> -->
@@ -212,7 +312,7 @@
           <component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
             <unit bldFile="/sf/mw/appsupport/tzservices/tzlocrscfactory/group" mrp="/sf/mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
           </component>
-          <component name="tzdatabase" long-name="Time Zone Database" filter="test" introduced="9.1" purpose="optional" class="config">
+          <component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
             <unit bldFile="/sf/mw/appsupport/tzservices/tzdatabase/group" mrp="/sf/mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
           </component>
         </collection>
@@ -259,12 +359,6 @@
           </component>
         </collection>
         <collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-          <component name="appsupport_plat" filter="s60" long-name="Generic Application Support Platform Interfaces" class="api">
-            <unit bldFile="/sf/mw/appsupport/appsupport_plat/group"/>
-          </component>
-          <component name="appsupport_pub" filter="s60" long-name="Generic Application Support Public Interfaces" class="api">
-            <unit bldFile="/sf/mw/appsupport/appsupport_pub/group"/>
-          </component>
           <component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
             <unit mrp="/sf/mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
           </component>