diff -r ab35549ca79a -r 88cdb2de66e3 tip_pbc/mw/securitysrv/package_definition.xml
--- a/tip_pbc/mw/securitysrv/package_definition.xml	Mon Oct 04 18:03:42 2010 +0100
+++ b/tip_pbc/mw/securitysrv/package_definition.xml	Tue Oct 05 18:03:43 2010 +0100
@@ -55,196 +55,199 @@
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="securitysrv" level="generic" levels="plugin framework server generic specific" long-name="Security Services">
 <collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
-<component name="cms_api" long-name="CMS API" filter="s60" purpose="optional" class="api">
+<component name="cms_api" long-name="CMS API" filter="s60,build_as_app" purpose="optional" class="api">
 <unit bldFile="/sf/mw/securitysrv/secsrv_plat/cms_api/group"/>
 </component>
-<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" purpose="optional" class="api">
+<component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60,build_as_app" purpose="optional" class="api">
 <unit bldFile="/sf/mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
 </component>
-<component name="java_utils_api" long-name="Java Utils API" filter="s60" purpose="optional" class="api">
+<component name="java_utils_api" long-name="Java Utils API" filter="s60,build_as_app" purpose="optional" class="api">
 <unit bldFile="/sf/mw/securitysrv/secsrv_plat/java_utils_api/group"/>
 </component>
-<component name="wim_cert_api" long-name="WIM Cert API" filter="s60" purpose="optional" class="api">
+<component name="wim_cert_api" long-name="WIM Cert API" filter="s60,build_as_app" purpose="optional" class="api">
 <unit bldFile="/sf/mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
 </component>
-<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" purpose="optional" class="api">
+<component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60,build_as_app" purpose="optional" class="api">
 <unit bldFile="/sf/mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
 </component>
-<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" purpose="optional" class="api">
+<component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60,build_as_app" purpose="optional" class="api">
 <unit bldFile="/sf/mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
 </component>
-<component name="remote_lock_api" long-name="Remote Lock API" filter="s60" purpose="optional" class="api">
+<component name="remote_lock_api" long-name="Remote Lock API" filter="s60,build_as_app" purpose="optional" class="api">
 <unit bldFile="/sf/mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
 </component>
-<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" purpose="optional" class="api">
+<component name="pkidialog_api" long-name="PKI Dialog API" filter="s60,build_as_app" purpose="optional" class="api">
 <unit bldFile="/sf/mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
 </component>
-<component name="provisioning_api" long-name="Provisioning API" filter="s60" purpose="optional" class="api">
+<component name="provisioning_api" long-name="Provisioning API" filter="s60,build_as_app" purpose="optional" class="api">
 <unit bldFile="/sf/mw/securitysrv/secsrv_plat/provisioning_api/group"/>
 </component>
-<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" purpose="optional" class="api">
+<component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60,build_as_app" purpose="optional" class="api">
 <unit bldFile="/sf/mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
 </component>
-<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" purpose="optional" class="api">
+<component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60,build_as_app" purpose="optional" class="api">
 <unit bldFile="/sf/mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
 </component>
-<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" purpose="optional" class="api">
+<component name="security_code_ui_api" long-name="Security Code UI API" filter="s60,build_as_app" purpose="optional" class="api">
 <unit bldFile="/sf/mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
 </component>
-<component name="gba_api" long-name="GBA API" filter="s60" purpose="optional" class="api">
+<component name="gba_api" long-name="GBA API" filter="s60,build_as_app" purpose="optional" class="api">
 <unit bldFile="/sf/mw/securitysrv/secsrv_plat/gba_api/group"/>
 </component>
-<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" purpose="optional" class="api">
+<component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60,build_as_app" purpose="optional" class="api">
 <unit bldFile="/sf/mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
 </component>
-<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" purpose="optional" class="api">
+<component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60,build_as_app" purpose="optional" class="api">
 <unit bldFile="/sf/mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
 </component>
-<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" purpose="optional" class="api">
+<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60,build_as_app" purpose="optional" class="api">
 <unit bldFile="/sf/mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
 </component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" purpose="optional" class="api">
+<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60,build_as_app" purpose="optional" class="api">
 <unit bldFile="/sf/mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
 </component>
-<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" purpose="optional" class="api">
+<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60,build_as_app" purpose="optional" class="api">
 <unit bldFile="/sf/mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
 </component>
 </collection>
 <collection name="cms" long-name="Certificate Management Service" level="server">
 <!-- collection is really a component. Need to move down a directory-->
-<component name="cms_build" long-name="CMS" introduced="^3" filter="s60" purpose="optional">
+<component name="cms_build" long-name="CMS" introduced="^3" filter="s60,build_as_app" purpose="optional">
 <unit bldFile="/sf/mw/securitysrv/cms/group"/>
 </component>
 </collection>
 <collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-<component name="x509certnameparser" long-name="X.509 Certificate Name Parser" filter="s60" purpose="optional">
+<component name="x509certnameparser" long-name="X.509 Certificate Name Parser" filter="s60,build_as_app" purpose="optional">
 <unit bldFile="/sf/mw/securitysrv/pkiutilities/x509certnameparser/group"/>
 </component>
-<component name="pkcs12" long-name="PKCS #12" filter="s60" purpose="optional">
+<component name="pkcs12" long-name="PKCS #12" filter="s60,build_as_app" purpose="optional">
 <unit bldFile="/sf/mw/securitysrv/pkiutilities/pkcs12/group"/>
 </component>
-<component name="ctsecuritydialogs" long-name="Crypto Token Security Dialogs" filter="s60" purpose="optional">
-<unit bldFile="/sf/mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-</component>
-<component name="certsaver" long-name="Certificate Saver" filter="s60" purpose="optional">
+<component name="certsaver" long-name="Certificate Saver" filter="s60,build_as_app" purpose="optional">
 <unit bldFile="/sf/mw/securitysrv/pkiutilities/certsaver/group"/>
 </component>
-<component name="devicetoken" long-name="Device Token" filter="s60" purpose="optional">
+<component name="devicetoken" long-name="Device Token" filter="s60,build_as_app" purpose="optional">
 <unit bldFile="/sf/mw/securitysrv/pkiutilities/devicetoken/group"/>
 </component>
-<component name="certificates" long-name="Certificates" filter="s60" purpose="optional">
-<unit bldFile="/sf/mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
+<component name="securitydialognotifier" long-name="Security Dialogs Notifier" introduced="^4" filter="s60,build_as_app" purpose="optional">
+<unit bldFile="/sf/mw/securitysrv/pkiutilities/securitydialognotifier/group"/>
 </component>
-<component name="pkiutilities_build" long-name="PKI Utilities Build" filter="s60" purpose="optional">
+<component name="securitydialognotifiersrv" long-name="Security Dialogs Notifier Server" introduced="^4" filter="s60,build_as_app" purpose="optional">
+<unit bldFile="/sf/mw/securitysrv/pkiutilities/securitydialognotifiersrv/group"/>
+</component>
+<component name="certificates" long-name="Certificates" filter="s60,build_as_app" purpose="optional">
+<unit bldFile="/sf/mw/securitysrv/pkiutilities/Certificates/group"/>
+</component>
+<component name="pkiutilities_build" long-name="PKI Utilities Build" filter="s60,build_as_app" purpose="optional">
 <!-- need to split this into the above components -->
 <unit bldFile="/sf/mw/securitysrv/pkiutilities/group"/>
 </component>
-<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
+<component name="ocsp" long-name="Online Certificate Status Protocol" introduced="^2" filter="s60,build_as_app" purpose="optional">
 <unit bldFile="/sf/mw/securitysrv/pkiutilities/ocsp/group" mrp="/sf/mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
 </component>
-<component name="untrustedcertificatedialog" long-name="Untrusted Certificate Dialog" introduced="^4" filter="s60" purpose="optional">
-<unit bldFile="/sf/mw/securitysrv/pkiutilities/untrustedcertificatedialog" proFile="untrustedcertificateplugin.pro" qmakeArgs="-r"/>
+<component name="ocsp_ncp" long-name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
+<unit bldFile="/sf/mw/securitysrv/pkiutilities/ocsp/group_ncp" mrp="/sf/mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
+</component>
+<component name="untrustedcertificatedialog" long-name="Untrusted Certificate Dialog" introduced="^4" filter="s60,build_as_app" purpose="optional">
+<unit bldFile="/sf/mw/securitysrv/pkiutilities/untrustedcertificatedialog" proFile="untrustedcertificateplugin.pro"/>
 </component>
 </collection>
 <collection name="wim" long-name="Wireless Identity Module" level="framework">
 <!-- collection is really a component. Need to move down a directory-->
-<component name="wim_build" long-name="WIM Build" filter="s60" purpose="optional">
+<component name="wim_build" long-name="WIM Build" filter="s60,build_as_app" purpose="optional">
 <unit bldFile="/sf/mw/securitysrv/wim/group"/>
 </component>
 </collection>
 <collection name="remotelock" long-name="Remote Lock" level="generic">
 <!-- collection is really a component. Need to move down a directory-->
-<component name="remotelock_build" long-name="Remote Lock Build" filter="s60" purpose="optional">
+<component name="remotelock_build" long-name="Remote Lock Build" filter="s60,build_as_app" purpose="optional">
 <unit bldFile="/sf/mw/securitysrv/remotelock/group"/>
 </component>
 </collection>
 <collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-<component name="keylockpolicyapi" long-name="Keylock Policy API" filter="s60" purpose="optional">
+<component name="keylockpolicyapi" long-name="Keylock Policy API" filter="s60,build_as_app" purpose="optional">
 <unit bldFile="/sf/mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
 </component>
-<component name="secui" long-name="Security UI" filter="s60" purpose="optional">
+<component name="secui" long-name="Security UI" filter="s60,build_as_app" purpose="optional">
 <unit bldFile="/sf/mw/securitysrv/securitydialogs/secui/group"/>
 </component>
-<component name="securitynotifier" long-name="Security Notifier" filter="s60" purpose="optional">
+<component name="securitynotifier" long-name="Security Notifier" filter="s60,build_as_app" purpose="optional">
 <unit bldFile="/sf/mw/securitysrv/securitydialogs/securitynotifier/group"/>
 </component>
-<component name="lockclient" long-name="Lock Client" introduced="^3" filter="s60" purpose="optional">
-<!-- This overwrites the bld.inf already in this dir. I'm pretty sure this will cause problems with the export -->
-<unit bldFile="/sf/mw/securitysrv/securitydialogs/lockclient/group" proFile="lockclient.pro" qmakeArgs="-r"/>
+<component name="lockclient" long-name="Lock Client" introduced="^3" filter="s60,build_as_app" purpose="optional">
+<unit bldFile="/sf/mw/securitysrv/securitydialogs/lockclient/group" proFile="lockclient.pro"/>
 </component>
-<component name="lockapp" long-name="Lock Application" introduced="^3" filter="s60" purpose="optional">
+<component name="lockapp" long-name="Lock Application" introduced="^3" filter="s60,build_as_app" purpose="optional">
 <unit bldFile="/sf/mw/securitysrv/securitydialogs/lockapp/group"/>
 </component>
-<component name="secuinotifications" long-name="Security UI Notifications" introduced="^4" filter="s60" purpose="optional">
-<unit bldFile="/sf/mw/securitysrv/securitydialogs/secuinotifications" proFile="secuinotifications.pro" qmakeArgs="-r"/>
+<component name="secuinotifications" long-name="Security UI Notifications" introduced="^4" filter="s60,build_as_app" purpose="optional">
+<unit bldFile="/sf/mw/securitysrv/securitydialogs/secuinotifications" proFile="secuinotifications.pro"/>
 </component>
-<component name="indicatorautolockplugin" long-name="Auto Lock Indicator Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y">
+<component name="indicatorautolockplugin" long-name="Auto Lock Indicator Plugin" introduced="^4" filter="s60,build_as_app" purpose="optional" plugin="Y">
 <!-- directory at the wrong level to be a component-->
-<unit bldFile="/sf/mw/securitysrv/securitydialogs/autolock/indicatorplugin" proFile="indicatorautolockplugin.pro" qmakeArgs="-r"/>
+<unit bldFile="/sf/mw/securitysrv/securitydialogs/autolock/indicatorplugin" proFile="indicatorautolockplugin.pro"/>
 </component>
-<component name="autolockuseractivityservice" long-name="Auto Lock User Activity Service" introduced="^4" filter="s60" purpose="optional">
+<component name="autolockuseractivityservice" long-name="Auto Lock User Activity Service" introduced="^4" filter="s60,build_as_app" purpose="optional">
 <!-- Can't have a component inside another. Need to move to securitydialogs/autolockuseractivityservice -->
-<unit bldFile="/sf/mw/securitysrv/securitydialogs/autolock/autolockuseractivityservice" proFile="autolockuseractivityservice.pro" qmakeArgs="-r"/>
+<unit bldFile="/sf/mw/securitysrv/securitydialogs/autolock/autolockuseractivityservice" proFile="autolockuseractivityservice.pro"/>
 </component>
-<component name="autolocksrv" long-name="Auto Lock Server" introduced="^4" filter="s60" purpose="optional">
-<unit bldFile="/sf/mw/securitysrv/securitydialogs/autolock" proFile="autolock.pro" qmakeArgs="-r"/>
+<component name="autolocksrv" long-name="Auto Lock Server" introduced="^4" filter="s60,build_as_app" purpose="optional">
+<unit bldFile="/sf/mw/securitysrv/securitydialogs/autolock" proFile="autolock.pro"/>
 </component>
 </collection>
 <collection name="cpsecplugins" long-name="Security Settings Plugins" level="plugin">
-<component name="devicelockplugin" long-name="Device Lock Plugin" introduced="^4" filter="s60" purpose="optional">
-<unit bldFile="/sf/mw/securitysrv/cpsecplugins/devicelockplugin" proFile="devicelockplugin.pro" qmakeArgs="-r"/>
+<component name="devicelockplugin" long-name="Device Lock Plugin" introduced="^4" filter="s60,build_as_app" purpose="optional" plugin="Y">
+<unit bldFile="/sf/mw/securitysrv/cpsecplugins/devicelockplugin" proFile="devicelockplugin.pro"/>
 </component>
-<component name="simpincodeplugin" long-name="SIM PIN Code Plugin" introduced="^4" filter="s60" purpose="optional">
-<unit bldFile="/sf/mw/securitysrv/cpsecplugins/simpincodeplugin" proFile="pincodeplugin.pro" qmakeArgs="-r"/>
+<component name="simpincodeplugin" long-name="SIM PIN Code Plugin" introduced="^4" filter="s60,build_as_app" purpose="optional" plugin="Y">
+<unit bldFile="/sf/mw/securitysrv/cpsecplugins/simpincodeplugin" proFile="pincodeplugin.pro"/>
 </component>
-<component name="cpadvancedsecplugin" long-name="Advanced Security Plugin" introduced="^4" filter="s60" purpose="optional">
-<unit bldFile="/sf/mw/securitysrv/cpsecplugins/cpadvancedsecplugin/group" proFile="advancedsecplugin.pro" qmakeArgs="-r"/>
+<component name="cpadvancedsecplugin" long-name="Advanced Security Plugin" introduced="^4" filter="s60,build_as_app" purpose="optional" plugin="Y">
+<unit bldFile="/sf/mw/securitysrv/cpsecplugins/cpadvancedsecplugin/group" proFile="advancedsecplugin.pro"/>
 </component>
 </collection>
 <collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
 <!-- collection is really a component. Need to move down a directory-->
-<component name="boottimeintegritycheck_build" long-name="Boot Time Integrity Check Build" filter="s60" purpose="optional">
+<component name="boottimeintegritycheck_build" long-name="Boot Time Integrity Check Build" filter="s60,build_as_app" purpose="optional">
 <unit bldFile="/sf/mw/securitysrv/boottimeintegritycheck/group"/>
 </component>
 </collection>
 <collection name="gba" long-name="Generic Bootstrapping Architecture" level="server">
-<component name="uicc" long-name="UICC" introduced="^2" filter="s60" purpose="optional" plugin="Y">
+<component name="uicc" long-name="UICC" introduced="^2" filter="s60,build_as_app" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/securitysrv/gba/uicc/group"/>
 </component>
-<component name="gbaserver" long-name="GBA Server" introduced="^2" filter="s60" purpose="optional">
+<component name="gbaserver" long-name="GBA Server" introduced="^2" filter="s60,build_as_app" purpose="optional">
 <unit bldFile="/sf/mw/securitysrv/gba/gbaserver/group"/>
 </component>
-<component name="gbaapi" long-name="GBA API" introduced="^2" filter="s60" purpose="optional">
+<component name="gbaapi" long-name="GBA API" introduced="^2" filter="s60,build_as_app" purpose="optional">
 <unit bldFile="/sf/mw/securitysrv/gba/gbaapi/group"/>
 </component>
-<component name="gbafilter" long-name="GBA HTTP Filter" introduced="^2" filter="s60" purpose="optional" plugin="Y">
+<component name="gbafilter" long-name="GBA HTTP Filter" introduced="^2" filter="s60,build_as_app" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/securitysrv/gba/gbafilter/group"/>
 </component>
-<component name="gba_build" long-name="Generic Boot Architecture Build" introduced="^2" filter="s60" purpose="optional">
-<!-- need to split this into the above components, or remove #includes and make this GBA ROM  -->
-<unit bldFile="/sf/mw/securitysrv/gba/group"/>
+<component name="gba_rom" long-name="Generic Boot Architecture ROM" introduced="^2" filter="s60,build_as_app" purpose="optional">
+<unit bldFile="/sf/mw/securitysrv/gba/rom"/>
 </component>
 </collection>
 <collection name="devencdiskutils" long-name="Device Encryption Disk Utils" level="server">
-<component name="devenccommonutils" long-name="Device Encryption Common Utils" introduced="^3" filter="s60" purpose="optional">
+<component name="devenccommonutils" long-name="Device Encryption Common Utils" introduced="^3" filter="s60,build_as_app" purpose="optional">
 <unit bldFile="/sf/mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
 </component>
-<component name="devencrfsplugin" long-name="Device Encryption RFS Plugin" introduced="^3" filter="s60" purpose="optional" plugin="Y">
+<component name="devencrfsplugin" long-name="Device Encryption RFS Plugin" introduced="^3" filter="s60,build_as_app" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
 </component>
-<component name="pk5recognizer" long-name="Device Encryption Pk5 Recognizer" introduced="^3" filter="s60" purpose="optional" plugin="Y">
+<component name="pk5recognizer" long-name="Device Encryption Pk5 Recognizer" introduced="^3" filter="s60,build_as_app" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
 </component>
-<component name="devencstarter" long-name="Device Encryption Starter" introduced="^3" filter="s60" purpose="optional" plugin="Y">
+<component name="devencstarter" long-name="Device Encryption Starter" introduced="^3" filter="s60,build_as_app" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
 </component>
-<component name="devencdiskutils_build" long-name="Device Encryption Disk Utils Build" introduced="^3" filter="s60" purpose="optional">
-<!-- need to split this into the above components, or remove #includes and make this a ROM  component-->
-<unit bldFile="/sf/mw/securitysrv/devencdiskutils/group"/>
+<component name="devencdiskutils_rom" long-name="Device Encryption Disk Utils ROM" introduced="^3" filter="s60,build_as_app" purpose="optional">
+<unit bldFile="/sf/mw/securitysrv/devencdiskutils/rom"/>
 </component>
 </collection>
 <collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-<component name="securitysrv_test" long-name="Security Services Test" filter="s60,test,api_test" purpose="development"/>
+<component name="securitysrv_test" long-name="Security Services Test" filter="s60,build_as_app,test,api_test" purpose="development"/>
 <component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
 <unit mrp="/sf/mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
 </component>