--- a/symbian4/mw/accesssec/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
+++ b/symbian4/mw/accesssec/package_definition.xml	Tue Sep 07 16:33:09 2010 +0100
@@ -50,37 +50,37 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="accesssec" level="generic" levels="plugin framework server generic specific" long-name="Access Security">
+   <block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
 <collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" purpose="optional" class="api">
+<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="eap_type_api" long-name="EAP Type API" filter="s60" purpose="optional" class="api">
+<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="eap_qt_configuration_api" long-name="EAP Qt Configuration API" introduced="^4" filter="s60" purpose="optional" class="api">
-<unit bldFile="/sf/mw/accesssec/accesssec_plat" proFile="accesssec_plat.pro" qmakeArgs="-r"/>
+<component name="eap_qt_configuration_api" long-name="EAP Qt Configuration API" filter="s60" introduced="^4" class="api">
+<unit bldFile="/sf/mw/accesssec/accesssec_plat" proFile="accesssec_plat.pro"/>
 </component>
 </collection>
 <collection name="securitysettings" long-name="WLAN Security Settings" level="specific">
-<component name="accesssec_qtconfigutils" long-name="Access Security Config Utils" introduced="^4" filter="s60" purpose="optional">
-<unit bldFile="/sf/mw/accesssec/securitysettings/qtconfigutils" proFile="qtconfigutils.pro" qmakeArgs="-r"/>
+<component name="accesssec_qtconfigutils" filter="s60" long-name="Access Security Config Utils" introduced="^4">
+<unit bldFile="/sf/mw/accesssec/securitysettings/qtconfigutils" proFile="qtconfigutils.pro"/>
 </component>
-<component name="cpwlansecurityuiplugins" long-name="Control Panel WLAN Security UI Plugins" introduced="^4" filter="s60" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/accesssec/securitysettings/cpwlansecurityuiplugins" proFile="cpwlansecurityuiplugins.pro" qmakeArgs="-r"/>
+<component name="cpwlansecurityuiplugins" filter="s60" long-name="Control Panel WLAN Security UI Plugins" introduced="^4" plugin="Y">
+<unit bldFile="/sf/mw/accesssec/securitysettings/cpwlansecurityuiplugins" proFile="cpwlansecurityuiplugins.pro"/>
 </component>
-<component name="cpeapuiplugins" long-name="Control Panel EAP UI Pugins" introduced="^4" filter="s60" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/accesssec/securitysettings/cpeapuiplugins" proFile="cpeapuiplugins.pro" qmakeArgs="-r"/>
+<component name="cpeapuiplugins" filter="s60" long-name="Control Panel EAP UI Pugins" introduced="^4" plugin="Y">
+<unit bldFile="/sf/mw/accesssec/securitysettings/cpeapuiplugins" proFile="cpeapuiplugins.pro"/>
 </component>
-<component name="eapqtdialogs" long-name="EAP Qt Dialogs" introduced="^4" filter="s60" purpose="optional">
-<unit bldFile="/sf/mw/accesssec/securitysettings/eapqtdialogs" proFile="eapqtdialogs.pro" qmakeArgs="-r"/>
+<component name="eapqtdialogs" filter="s60" long-name="EAP Qt Dialogs" introduced="^4">
+<unit bldFile="/sf/mw/accesssec/securitysettings/eapqtdialogs" proFile="eapqtdialogs.pro"/>
 </component>
 </collection>
 <collection name="eapol" long-name="EAPOL" level="framework">
-<component name="eapol_framework" long-name="EAPOL Framework" introduced="9.2" filter="s60" purpose="optional">
+<component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
 <unit bldFile="/sf/mw/accesssec/eapol/group"/>
 </component>
 </collection>