--- a/symbian4/mw/securitysrv/package_definition.xml	Sat Jun 26 14:31:58 2010 +0100
+++ b/symbian4/mw/securitysrv/package_definition.xml	Tue Jun 29 12:34:13 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
@@ -123,18 +123,12 @@
 <component name="pkcs12" filter="s60" long-name="PKCS #12">
 <unit bldFile="/sf/mw/securitysrv/pkiutilities/pkcs12/group"/>
 </component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="/sf/mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
 <component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
 <unit bldFile="/sf/mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
 </component>
 <component name="certsaver" filter="s60" long-name="Certificate Saver">
 <unit bldFile="/sf/mw/securitysrv/pkiutilities/certsaver/group"/>
 </component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="/sf/mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
 <component name="devicetoken" filter="s60" long-name="Device Token">
 <unit bldFile="/sf/mw/securitysrv/pkiutilities/devicetoken/group"/>
 </component>
@@ -174,7 +168,8 @@
 <component name="securitynotifier" filter="s60" long-name="Security Notifier">
 <unit bldFile="/sf/mw/securitysrv/securitydialogs/securitynotifier/group"/>
 </component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^4">
+<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
+<!-- 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>
 <component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
@@ -183,6 +178,29 @@
 <component name="secuinotifications" long-name="Security UI Notifications" introduced="^4" filter="s60">
 <unit bldFile="/sf/mw/securitysrv/securitydialogs/secuinotifications" proFile="secuinotifications.pro" qmakeArgs="-r"/>
 </component>
+<component name="indicatorautolockplugin" long-name="Auto Lock Indicator Plugin" introduced="^4" filter="s60" plugin="Y">
+<!-- directory at the wrong level to be a component-->
+<unit bldFile="/sf/mw/securitysrv/securitydialogs/AutolockSrv/indicatorplugin" proFile="indicatorautolockplugin.pro" qmakeArgs="-r"/>
+</component>
+<component name="autolockuseractivityservice" long-name="Auto Lock User Activity Service" introduced="^4" filter="s60">
+<!-- Can't have two .pro files in the same dir: their generated bld.infs will overwrite each other-->
+<unit bldFile="/sf/mw/securitysrv/securitydialogs/AutolockSrv" proFile="autolockuseractivityservice.pro" qmakeArgs="-r"/>
+</component>
+<component name="autolocksrv" long-name="Auto Lock Server" introduced="^4" filter="s60">
+<!-- directory at the wrong level to be a component-->
+<unit bldFile="/sf/mw/securitysrv/securitydialogs/AutolockSrv" proFile="AutolockSrv.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="cpsecplugins" long-name="Security Settings Plugins" level="plugin">
+<component name="devicelockplugin" long-name="Device Lock Plugin" introduced="^4" filter="s60">
+<unit bldFile="/sf/mw/securitysrv/cpsecplugins/devicelockplugin" proFile="devicelockplugin.pro" qmakeArgs="-r"/>
+</component>
+<component name="simpincodeplugin" long-name="SIM PIN Code Plugin" introduced="^4" filter="s60">
+<unit bldFile="/sf/mw/securitysrv/cpsecplugins/simpincodeplugin" proFile="pincodeplugin.pro" qmakeArgs="-r"/>
+</component>
+<component name="cpadvancedsecplugin" long-name="Advanced Security Plugin" introduced="^4" filter="s60">
+<unit bldFile="/sf/mw/securitysrv/cpsecplugins/cpadvancedsecplugin/group" proFile="advancedsecplugin.pro" qmakeArgs="-r"/>
+</component>
 </collection>
 <collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
 <!-- collection is really a component. Need to move down a directory-->