--- a/CompilerCompatibility/mw/serviceapi/package_definition.xml	Mon Mar 15 18:47:03 2010 +0000
+++ b/CompilerCompatibility/mw/serviceapi/package_definition.xml	Tue Mar 16 16:25:56 2010 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
+ <!ELEMENT SystemDefinition (systemModel)>
  <!ATTLIST SystemDefinition
   name CDATA #REQUIRED
   schema CDATA #REQUIRED>
@@ -49,61 +49,55 @@
   prebuilt NMTOKEN #IMPLIED
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
 <systemModel>
-<layer name="mw">
-<block name="serviceapi">
-<collection name="s60">
-<component name="serviceapi">
-<unit bldFile="/sf/mw/serviceapi/group" mrp=""/>
-</component>
-</collection>
-</block>
+<layer name="mw" long-name="Middleware" levels="generic specific">
+<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">
+     <component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
+      <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
+     </component>
+     <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" plugin="Y">
+      <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
+     </component>
+     <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" plugin="Y">
+      <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/group"/>
+     </component>
+     <component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
+      <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
+     </component>
+     <component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
+      <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_calendar/group"/>
+     </component>
+     <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" plugin="Y">
+      <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_sensor/group"/>
+     </component>
+     <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" plugin="Y">
+      <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
+     </component>
+     <component name="jsapi" long-name="Javascript API" filter="s60" plugin="Y">
+      <unit bldFile="/sf/mw/serviceapi/serviceproviders/jsapi/group"/>
+     </component>
+     <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>
+    </collection>
+   </block>
 </layer>
 </systemModel>
-</SystemDefinition>
+</SystemDefinition>
\ No newline at end of file