--- a/symbian4/mw/serviceapi/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
+++ b/symbian4/mw/serviceapi/package_definition.xml	Tue Sep 07 16:33:09 2010 +0100
@@ -50,50 +50,50 @@
   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="serviceapi" level="specific" levels="os mw1 mw2 app" long-name="Service API">
+   <block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
 <!-- should break up this collection into something meaningful -->
 <collection name="serviceproviders" long-name="Service Providers" level="mw1">
 <!-- are commented out components to be removed? -->
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" purpose="optional" plugin="Y" class="placeholder">
+<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y" class="placeholder">
 <!--<unit bldFile="serviceproviders/sapi_contacts_vpbk/group"/>-->
 </component>
-<component name="sapi_location" long-name="Location SAPI" filter="s60" purpose="optional" plugin="Y">
+<component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
 <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_location/group"/>
 </component>
-<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" purpose="optional" plugin="Y">
+<component name="sapi_mediamanagement" long-name="Media Management SAPI" filter="s60" plugin="Y">
 <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
 </component>
-<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" purpose="optional" plugin="Y">
+<component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
 <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
 </component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" purpose="optional" plugin="Y" class="placeholder">
+<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y" class="placeholder">
 <!-- <unit bldFile="serviceproviders/sapi_messaging/group"/> -->
 </component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" purpose="optional" plugin="Y" class="placeholder">
+<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y" class="placeholder">
 <!--  <unit bldFile="serviceproviders/sapi_applicationmanager/group"/>-->
 </component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" purpose="optional" plugin="Y" class="placeholder">
+<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y" class="placeholder">
 <!-- <unit bldFile="serviceproviders/sapi_calendar/group"/> -->
 </component>
-<component name="sapi_logging" long-name="Logging SAPI" filter="s60" purpose="optional" plugin="Y">
+<component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
 <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_logging/group"/>
 </component>
-<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" purpose="optional" plugin="Y">
+<component name="sapi_sensor" long-name="Sensor SAPI" filter="s60" plugin="Y">
 <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_sensor/group"/>
 </component>
-<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" purpose="optional" plugin="Y">
+<component name="sapi_sysinfo" long-name="Sysinfo SAPI" filter="s60" plugin="Y">
 <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
 </component>
-<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" purpose="optional" plugin="Y">
+<component name="sapi_serviceregistry" long-name="Service Registry SAPI" filter="s60" plugin="Y">
 <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
 </component>
-<component name="jsapi" long-name="Javascript API" filter="s60" purpose="optional" plugin="Y">
+<component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
 <unit bldFile="/sf/mw/serviceapi/serviceproviders/jsapi/group"/>
 </component>
-<component name="serviceproviders_build" long-name="Service API Build" filter="s60" purpose="optional">
+<component name="serviceproviders_build" filter="s60" long-name="Service API Build">
 <!--  distribute the exports or make this a ROM component by removing the #includes -->
 <unit bldFile="/sf/mw/serviceapi/serviceproviders/group"/>
 </component>