--- a/symbian3/os/lbs/package_definition.xml Tue May 25 11:17:36 2010 +0100
+++ b/symbian3/os/lbs/package_definition.xml Wed May 26 17:18:20 2010 +0100
@@ -1,172 +1,94 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!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>
- </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">
- <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
- <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
- </component>
- <component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
- <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
- <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/sfgroup" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
- </component>
- <component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
- <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
- <unit bldFile="/sf/os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
- </component>
- <component name="suplrrlpprotocol" long-name="SUPL RRLP Protocol Module">
- <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
- <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
- </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 schema="3.0.0">
+ <package id="lbs" name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+ <collection id="datasourcemodules" name="Generic Positioning Plugins" level="data-acquisition">
+ <component id="defaultpositioningmodule" name="Default Positioning Module" introduced="^2" purpose="optional" class="plugin">
+ <unit bldFile="datasourcemodules/defaultpositioningmodule/group" mrp="datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
+ </component>
+ <component id="bluetoothgpspositioningmodule" name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" class="plugin">
+ <unit bldFile="datasourcemodules/bluetoothgpspositioningmodule/group" mrp="datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
+ </component>
+ <component id="simulationpositioningmodule" name="Simulation Positioning Module" introduced="^2" purpose="development" class="plugin">
+ <unit bldFile="datasourcemodules/simulationpositioningmodule/group" mrp="datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
+ </component>
+ <component id="gpspositioningmodule" name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="datasourcemodules/gpspositioningmodule/group" mrp="datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
+ </component>
+ <component id="networkpositioningmodule" name="Network Positioning Module" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="datasourcemodules/networkpositioningmodule/group" mrp="datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
+ </component>
+ <component id="locationapesuplpsy" name="APE SUPL PSY" introduced="^3" purpose="optional" class="plugin" filter="s60">
+ <unit bldFile="datasourcemodules/locationapesuplpsy/group"/>
+ </component>
+ </collection>
+ <collection id="datasourceadaptation" name="Data Source Adaptation" level="adaptation">
+ <component id="gpsdatasourceadaptation" name="GPS Data Source Adaptation" introduced="^2" purpose="optional" class="plugin">
+ <unit bldFile="datasourceadaptation/gpsdatasourceadaptation/group" mrp="datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+ </component>
+ </collection>
+ <collection id="locationrequestmgmt" name="Location Request Management" level="application-interface">
+ <component id="locationserver" name="Location Server" introduced="9.2" purpose="optional">
+ <unit bldFile="locationrequestmgmt/locationserver/group" mrp="locationrequestmgmt/locationserver/group/lbs_locationserver.mrp"/>
+ </component>
+ <component id="networkrequesthandler" name="Network Request Handler" introduced="9.2" purpose="optional">
+ <unit bldFile="locationrequestmgmt/networkrequesthandler/group" mrp="locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
+ </component>
+ </collection>
+ <collection id="lbstest" name="Locating Services Tests" level="application-interface">
+ <component id="lbstestproduct" name="LBS Test Product" introduced="9.2" purpose="development" filter="test">
+ <unit mrp="lbstest/lbstestproduct/group/lbs_testproduct.mrp" bldFile="lbstest/lbstestproduct/group"/>
+ </component>
+ <component id="locationprotocoltest" name="Location Protocol Tests" introduced="9.2" purpose="development" class="plugin">
+ <unit bldFile="lbstest/locationprotocoltest/group" mrp="lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
+ </component>
+ </collection>
+ <collection id="locationmgmt" name="Location Management" level="management">
+ <component id="locmonitor" name="Location Monitor" introduced="^3" purpose="optional">
+ <unit bldFile="locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
+ </component>
+ <component id="agpslocationmgr" name="A-GPS Location Manager" introduced="9.2" purpose="optional">
+ <unit bldFile="locationmgmt/agpslocationmgr/group" mrp="locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
+ </component>
+ <component id="networklocationmgr" name="Network Location Manager" introduced="9.2" purpose="optional">
+ <unit bldFile="locationmgmt/networklocationmgr/group" mrp="locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
+ </component>
+ <component id="locationcore" name="Location Core" introduced="9.2" purpose="optional">
+ <unit bldFile="locationmgmt/locationcore/group" mrp="locationmgmt/locationcore/group/lbs_admin.mrp"/>
+ </component>
+ <component id="networkgateway" name="Network Gateway" introduced="9.2" purpose="optional">
+ <unit bldFile="locationmgmt/networkgateway/group" mrp="locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
+ </component>
+ </collection>
+ <collection id="networkprotocolmodules" name="Network Protocol Modules" level="adaptation">
+ <component id="privacyprotocolmodule" name="Privacy Protocol Module" introduced="^2" purpose="optional" class="plugin">
+ <unit bldFile="networkprotocolmodules/privacyprotocolmodule/group" mrp="networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
+ </component>
+ <component id="suplproxyprotocolmodule" name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" class="plugin">
+ <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+ <unit bldFile="networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+ </component>
+ <component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
+ <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+ <unit bldFile="networkprotocolmodules/suplprotocolmodule/sfgroup" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+ </component>
+ <component id="suplrrlpasn1" filter="sf_build" name="SUPL RRLP ASN1 Parser">
+ <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+ <unit bldFile="networkprotocolmodules/common/suplrrlpasn1/group"/>
+ </component>
+ <component id="suplrrlpprotocol" name="SUPL RRLP Protocol Module">
+ <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+ <unit bldFile="networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
+ </component>
+ </collection>
+ <collection id="lbsapitest" name="Location API Tests" level="application-interface">
+ <component id="lbshaitest" name="Location HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="lbsapitest/lbshaitest/group/lbshaitest.mrp" bldFile="lbsapitest/lbshaitest/group"/>
+ </component>
+ </collection>
+ <collection id="lbs_info" name="Locating Services Info" level="application-interface">
+ <component id="lbs_metadata" name="Locating Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="lbs_info/lbs_metadata/lbs_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
</SystemDefinition>