diff -r 4469f26a2533 -r a44ae815a47f symbian3/mw/accesssec/package_definition.xml
--- a/symbian3/mw/accesssec/package_definition.xml	Wed Apr 21 18:29:51 2010 +0100
+++ b/symbian3/mw/accesssec/package_definition.xml	Tue May 18 16:26:09 2010 +0100
@@ -54,35 +54,74 @@
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
-    <collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-     <component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-      <!-- the directory for this needs to be moved up to the right level -->
-      <unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-     </component>
-     <component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-      <unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-     </component>
-     <component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-      <unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-     </component>
-     <component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-      <unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-     </component>
-     <component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-      <unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-     </component>
-    </collection>
-    <collection name="eapol" long-name="EAPOL" level="framework">
-     <component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-      <unit bldFile="/sf/mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-     </component>
-    </collection>
-    <collection name="accesssec_info" long-name="Access Security Info" level="specific">
-     <component name="accesssec_plat" filter="s60" long-name="Access Security Platform Interfaces" class="api">
-      <unit bldFile="/sf/mw/accesssec/accesssec_plat/group"/>
-     </component>
-    </collection>
-   </block>
+<collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
+<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
+<unit bldFile="/sf/mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
+</component>
+<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
+<unit bldFile="/sf/mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
+</component>
+<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
+<unit bldFile="/sf/mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
+</component>
+<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
+<unit bldFile="/sf/mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
+</component>
+<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
+<unit bldFile="/sf/mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
+</component>
+<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
+<unit bldFile="/sf/mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
+</component>
+<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
+<unit bldFile="/sf/mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
+</component>
+<component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
+<unit bldFile="/sf/mw/accesssec/accesssec_plat/eap_type_api/group"/>
+</component>
+<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
+<unit bldFile="/sf/mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
+</component>
+<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
+<unit bldFile="/sf/mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
+</component>
+<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
+<unit bldFile="/sf/mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
+</component>
+<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
+<unit bldFile="/sf/mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
+</component>
+<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
+<unit bldFile="/sf/mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
+</component>
+<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
+<unit bldFile="/sf/mw/accesssec/accesssec_plat/wapi_db_api/group"/>
+</component>
+</collection>
+<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
+<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
+<!-- the directory for this needs to be moved up to the right level -->
+<unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
+</component>
+<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
+<unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
+</component>
+<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
+<unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
+</component>
+<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
+<unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
+</component>
+<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
+<unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
+</component>
+</collection>
+<collection name="eapol" long-name="EAPOL" level="framework">
+<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
+<unit bldFile="/sf/mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file