--- a/symbian3/os/lbs/package_definition.xml	Wed Feb 03 11:49:07 2010 +0000
+++ b/symbian3/os/lbs/package_definition.xml	Wed Feb 03 19:36:09 2010 +0000
@@ -1,184 +1,166 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  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">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="tb91" purpose="development" plugin="Y">
-<unit bldFile="/sf/os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<component name="networkpositioningmodule" long-name="Network Positioning Module" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
-</component>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="/sf/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-name="Location Server" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/lbs/locationrequestmgmt/locationserver/group" mrp="/sf/os/lbs/locationrequestmgmt/locationserver/group/lbs_locationserver.mrp"/>
-</component>
-<component name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="/sf/os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="lbstestproduct" long-name="LBS Test Product" introduced="9.2" purpose="development">
-<unit mrp="/sf/os/lbs/lbstest/lbstestproduct/group/lbs_testproduct.mrp"/>
-</component>
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="/sf/os/lbs/lbstest/locationprotocoltest/group" mrp="/sf/os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="/sf/os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/lbs/locationmgmt/agpslocationmgr/group" mrp="/sf/os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/lbs/locationmgmt/networklocationmgr/group" mrp="/sf/os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/lbs/locationmgmt/locationcore/group" mrp="/sf/os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-name="Network Gateway" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/lbs/locationmgmt/networkgateway/group" mrp="/sf/os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="tb92" purpose="optional" plugin="Y" class="placeholder">
-<!-- PLACEHOLDER="DS.1806"
-        <unit bldFile="networkprotocolmodules/suplproxyprotocolmodule/group" mrp="networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
-		-->
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
-<component name="lbshaitest" long-name="Location HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/lbs/lbsapitest/lbshaitest/group/lbshaitest.mrp"/>
-</component>
-</collection>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="lodo.lbs">
-<unit bldFile="/sf/os/lbs/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+  <systemModel>
+    <layer name="os" long-name="OS" levels="hw services">
+      <block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+        <collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
+          <component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
+          </component>
+          <component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
+          </component>
+          <component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
+            <unit bldFile="/sf/os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
+          </component>
+          <component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
+          </component>
+          <component name="networkpositioningmodule" long-name="Network Positioning Module" introduced="^3" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
+          </component>
+          <component name="locationapesuplpsy" long-name="APE SUPL PSY" introduced="^3" purpose="optional" filter="s60" plugin="Y">
+            <unit bldFile="/sf/os/lbs/datasourcemodules/locationapesuplpsy/group"/>
+          </component>
+          <component name="npeintegmodule" long-name="NPE Integration Module" introduced="^3" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/os/lbs/datasourcemodules/npeintegmodule/group" mrp="/sf/os/lbs/datasourcemodules/npeintegmodule/group/lbs_npeintegrationmodule.mrp"/>
+          </component>
+          <component name="datasourcemodules_build" long-name="Data Source Modules Build" introduced="^3" purpose="optional" filter="s60">
+            <!-- need to move the exports to another component, or make this a real component by removing the #include and moving down a directory -->
+            <unit bldFile="/sf/os/lbs/datasourcemodules/group"/>
+          </component>
+        </collection>
+        <collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
+          <component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="/sf/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+          </component>
+        </collection>
+        <collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
+          <component name="locationserver" long-name="Location Server" introduced="9.2" purpose="optional">
+            <unit bldFile="/sf/os/lbs/locationrequestmgmt/locationserver/group" mrp="/sf/os/lbs/locationrequestmgmt/locationserver/group/lbs_locationserver.mrp"/>
+          </component>
+          <component name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
+            <unit bldFile="/sf/os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="/sf/os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
+          </component>
+        </collection>
+        <collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
+          <component name="lbstestproduct" long-name="LBS Test Product" introduced="9.2" purpose="development" filter="test">
+            <unit mrp="/sf/os/lbs/lbstest/lbstestproduct/group/lbs_testproduct.mrp" bldFile="/sf/os/lbs/lbstest/lbstestproduct/group"/>
+          </component>
+          <component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
+            <unit bldFile="/sf/os/lbs/lbstest/locationprotocoltest/group" mrp="/sf/os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
+          </component>
+        </collection>
+        <collection name="locationmgmt" long-name="Location Management" level="management">
+          <component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
+            <unit bldFile="/sf/os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="/sf/os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
+          </component>
+          <component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
+            <unit bldFile="/sf/os/lbs/locationmgmt/agpslocationmgr/group" mrp="/sf/os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
+          </component>
+          <component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
+            <unit bldFile="/sf/os/lbs/locationmgmt/networklocationmgr/group" mrp="/sf/os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
+          </component>
+          <component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
+            <unit bldFile="/sf/os/lbs/locationmgmt/locationcore/group" mrp="/sf/os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
+          </component>
+          <component name="networkgateway" long-name="Network Gateway" introduced="9.2" purpose="optional">
+            <unit bldFile="/sf/os/lbs/locationmgmt/networkgateway/group" mrp="/sf/os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
+          </component>
+        </collection>
+        <collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
+          <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
+          </component>
+          <component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+          </component>
+        </collection>
+        <collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
+          <component name="lbshaitest" long-name="Location HAI Tests" introduced="^2" purpose="development" filter="test">
+            <unit mrp="/sf/os/lbs/lbsapitest/lbshaitest/group/lbshaitest.mrp" bldFile="/sf/os/lbs/lbsapitest/lbshaitest/group"/>
+          </component>
+        </collection>
+        <collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
+          <component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
+            <unit mrp="/sf/os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>