# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1283794357 -3600
# Node ID b3cd97947a8ac002b187d0b5906c642b0c08de05
# Parent  905c455d22994b70d5a22e5c48ff139d0c47f4e5
Update package models from latest system model  (platform@ef0ace5c7af5)

diff -r 905c455d2299 -r b3cd97947a8a CompilerCompatibility/mw/remotemgmt/package_definition.xml
--- a/CompilerCompatibility/mw/remotemgmt/package_definition.xml	Mon Sep 06 18:31:48 2010 +0100
+++ b/CompilerCompatibility/mw/remotemgmt/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
@@ -180,6 +180,9 @@
 <component name="syncml_ds_customization_api" long-name="SyncML DS Customization API" filter="s60" introduced="^3" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_ds_customization_api/group"/>
 </component>
+<component name="lawmo_plugin_api" long-name="Lawmo Plugin API" filter="s60" introduced="^3" class="api">
+<unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/lawmo_plugin_api/group"/>
+</component>
 </collection>
 <collection name="policymanagement" long-name="Policy Management" level="generic">
 <component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
diff -r 905c455d2299 -r b3cd97947a8a CompilerCompatibility/os/deviceplatformrelease/package_definition.xml
--- a/CompilerCompatibility/os/deviceplatformrelease/package_definition.xml	Mon Sep 06 18:31:48 2010 +0100
+++ b/CompilerCompatibility/os/deviceplatformrelease/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
@@ -139,8 +139,8 @@
 <component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
 <unit bldFile="/sf/os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
 </component>
-<component name="rombuild_sfrefhw" filter="sf_build" long-name="sf_refhw iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="/sf/os/deviceplatformrelease/sf_config/rombuild/sf_refhw/group"/>
+<component filter="sf_build" purpose="development" introduced="^3" class="config">
+<unit bldFile="/sf/os/deviceplatformrelease/os/deviceplatformrelease/sf_config/rombuild/sf_refhw/group"/>
 </component>
 </collection>
 <!-- should be located locally in buildplatforms/group. NB. This is a different package! -->
diff -r 905c455d2299 -r b3cd97947a8a CompilerCompatibility/os/lbs/package_definition.xml
--- a/CompilerCompatibility/os/lbs/package_definition.xml	Mon Sep 06 18:31:48 2010 +0100
+++ b/CompilerCompatibility/os/lbs/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
@@ -115,19 +115,27 @@
 </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"/>
+<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group" 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/SuplConnectionManager/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.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"/>
+<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/HostSettingsApi/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.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/SuplPushAPI/group" 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"/>
+<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplpmcore/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"/>
+<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/suplrrlpprotocol/group"/>
 </component>
 </collection>
 <collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
diff -r 905c455d2299 -r b3cd97947a8a symbian3/mw/remotemgmt/package_definition.xml
--- a/symbian3/mw/remotemgmt/package_definition.xml	Mon Sep 06 18:31:48 2010 +0100
+++ b/symbian3/mw/remotemgmt/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
@@ -180,6 +180,9 @@
 <component name="syncml_ds_customization_api" long-name="SyncML DS Customization API" filter="s60" introduced="^3" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_ds_customization_api/group"/>
 </component>
+<component name="lawmo_plugin_api" long-name="Lawmo Plugin API" filter="s60" introduced="^3" class="api">
+<unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/lawmo_plugin_api/group"/>
+</component>
 </collection>
 <collection name="policymanagement" long-name="Policy Management" level="generic">
 <component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
diff -r 905c455d2299 -r b3cd97947a8a symbian3/os/deviceplatformrelease/package_definition.xml
--- a/symbian3/os/deviceplatformrelease/package_definition.xml	Mon Sep 06 18:31:48 2010 +0100
+++ b/symbian3/os/deviceplatformrelease/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
@@ -139,8 +139,8 @@
 <component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
 <unit bldFile="/sf/os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
 </component>
-<component name="rombuild_sfrefhw" filter="sf_build" long-name="sf_refhw iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="/sf/os/deviceplatformrelease/sf_config/rombuild/sf_refhw/group"/>
+<component filter="sf_build" purpose="development" introduced="^3" class="config">
+<unit bldFile="/sf/os/deviceplatformrelease/os/deviceplatformrelease/sf_config/rombuild/sf_refhw/group"/>
 </component>
 </collection>
 <!-- should be located locally in buildplatforms/group. NB. This is a different package! -->
diff -r 905c455d2299 -r b3cd97947a8a symbian3/os/lbs/package_definition.xml
--- a/symbian3/os/lbs/package_definition.xml	Mon Sep 06 18:31:48 2010 +0100
+++ b/symbian3/os/lbs/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
@@ -115,19 +115,27 @@
 </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"/>
+<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group" 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/SuplConnectionManager/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.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"/>
+<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/HostSettingsApi/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.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/SuplPushAPI/group" 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"/>
+<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplpmcore/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"/>
+<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/suplrrlpprotocol/group"/>
 </component>
 </collection>
 <collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
diff -r 905c455d2299 -r b3cd97947a8a tip_bulk_s3/mw/remotemgmt/package_definition.xml
--- a/tip_bulk_s3/mw/remotemgmt/package_definition.xml	Mon Sep 06 18:31:48 2010 +0100
+++ b/tip_bulk_s3/mw/remotemgmt/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
@@ -180,6 +180,9 @@
 <component name="syncml_ds_customization_api" long-name="SyncML DS Customization API" filter="s60" introduced="^3" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_ds_customization_api/group"/>
 </component>
+<component name="lawmo_plugin_api" long-name="Lawmo Plugin API" filter="s60" introduced="^3" class="api">
+<unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/lawmo_plugin_api/group"/>
+</component>
 </collection>
 <collection name="policymanagement" long-name="Policy Management" level="generic">
 <component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
diff -r 905c455d2299 -r b3cd97947a8a tip_bulk_s3/os/deviceplatformrelease/package_definition.xml
--- a/tip_bulk_s3/os/deviceplatformrelease/package_definition.xml	Mon Sep 06 18:31:48 2010 +0100
+++ b/tip_bulk_s3/os/deviceplatformrelease/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
@@ -139,8 +139,8 @@
 <component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
 <unit bldFile="/sf/os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
 </component>
-<component name="rombuild_sfrefhw" filter="sf_build" long-name="sf_refhw iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="/sf/os/deviceplatformrelease/sf_config/rombuild/sf_refhw/group"/>
+<component filter="sf_build" purpose="development" introduced="^3" class="config">
+<unit bldFile="/sf/os/deviceplatformrelease/os/deviceplatformrelease/sf_config/rombuild/sf_refhw/group"/>
 </component>
 </collection>
 <!-- should be located locally in buildplatforms/group. NB. This is a different package! -->
diff -r 905c455d2299 -r b3cd97947a8a tip_bulk_s3/os/lbs/package_definition.xml
--- a/tip_bulk_s3/os/lbs/package_definition.xml	Mon Sep 06 18:31:48 2010 +0100
+++ b/tip_bulk_s3/os/lbs/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
@@ -115,19 +115,27 @@
 </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"/>
+<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group" 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/SuplConnectionManager/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.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"/>
+<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/HostSettingsApi/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.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/SuplPushAPI/group" 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"/>
+<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplpmcore/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"/>
+<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/suplrrlpprotocol/group"/>
 </component>
 </collection>
 <collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>