# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1265197747 0
# Node ID c94b55c3fb6143a1a440af0328e710a242c27b47
# Parent  262790aa488de6e527bb12177ec11ea9f523f5da
Finish off the packagedef changes for the mw layer

diff -r 262790aa488d -r c94b55c3fb61 symbian3/app/musicplayer/package_definition.xml
--- a/symbian3/app/musicplayer/package_definition.xml	Tue Feb 02 19:53:24 2010 +0000
+++ b/symbian3/app/musicplayer/package_definition.xml	Wed Feb 03 11:49:07 2010 +0000
@@ -137,7 +137,7 @@
         </collection>
         <collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
           <component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-            <!-- should explicityly #inlcude musicplayerbldvariant.hrh in each component  -->
+            <!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component  -->
             <unit bldFile="/sf/app/musicplayer/group"/>
           </component>
           <component name="musicplayer_plat" filter="s60" long-name="Music Player Apps Platform Interfaces" class="api">
diff -r 262790aa488d -r c94b55c3fb61 symbian3/app/rndtools/package_definition.xml
--- a/symbian3/app/rndtools/package_definition.xml	Tue Feb 02 19:53:24 2010 +0000
+++ b/symbian3/app/rndtools/package_definition.xml	Wed Feb 03 11:49:07 2010 +0000
@@ -86,12 +86,15 @@
         <collection name="filebrowser" long-name="File Browser" level="util">
           <!-- consider collapsing into a single component -->
           <component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-            <unit bldFile="/sf/app/rndtools/filebrowser/fileopserver/group"/>
+            <!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
+            <!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
           </component>
           <component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-            <unit bldFile="/sf/app/rndtools/filebrowser/fileopclient/group"/>
+            <!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
+            <!--<unit bldFile="filebrowser/fileopclient/group"/>-->
           </component>
           <component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
+            <!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
             <unit bldFile="/sf/app/rndtools/filebrowser/group"/>
           </component>
         </collection>
diff -r 262790aa488d -r c94b55c3fb61 symbian3/app/webuis/package_definition.xml
--- a/symbian3/app/webuis/package_definition.xml	Tue Feb 02 19:53:24 2010 +0000
+++ b/symbian3/app/webuis/package_definition.xml	Wed Feb 03 11:49:07 2010 +0000
@@ -90,18 +90,20 @@
         </collection>
         <collection name="browserplugins" long-name="Browser Plugins" level="plugin">
           <component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-            <unit bldFile="/sf/app/webuis/browserplugins/browsersysteminfoplugin/group"/>
+            <!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
+            <!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
           </component>
           <component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-            <unit bldFile="/sf/app/webuis/browserplugins/browsergpsplugin/group"/>
+            <!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
+            <!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
           </component>
           <component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
             <unit bldFile="/sf/app/webuis/browserplugins/browseraudiovideoplugin/group"/>
           </component>
-          <!--   <component id="browserplugins_build" filter="s60" name="Browser Plugins Build">-->
-          <!-- can the #ifdef in this be handled elsewhere? -->
-          <!-- <unit bldFile="browserplugins/group"/>
-      </component>-->
+          <component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
+            <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+            <unit bldFile="/sf/app/webuis/browserplugins/group"/>
+          </component>
         </collection>
         <collection name="pushmtm" long-name="Push MTM" level="plugin">
           <component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
diff -r 262790aa488d -r c94b55c3fb61 symbian3/app/webuis/package_definition_3.0.xml
--- a/symbian3/app/webuis/package_definition_3.0.xml	Tue Feb 02 19:53:24 2010 +0000
+++ b/symbian3/app/webuis/package_definition_3.0.xml	Wed Feb 03 11:49:07 2010 +0000
@@ -17,21 +17,23 @@
       	<meta rel="config">
       		<defined condition="__WEB_WIDGETS"/>
       	</meta>
-        <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>
+      	<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
+        <!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
       </component>
       <component id="browsergpsplugin" filter="s60" name="Browser GPS Plugin" class="plugin">
       	<meta rel="config">
       		<defined condition="__WEB_WIDGETS"/>
       	</meta>
-        <unit bldFile="browserplugins/browsergpsplugin/group"/>
+      	<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
+        <!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
       </component>
       <component id="browseraudiovideoplugin" filter="s60" name="Browser Audio Video Plugin" class="plugin">
         <unit bldFile="browserplugins/browseraudiovideoplugin/group"/>
       </component>
-    <!--   <component id="browserplugins_build" filter="s60" name="Browser Plugins Build">-->
-		<!-- can the #ifdef in this be handled elsewhere? -->
-        <!-- <unit bldFile="browserplugins/group"/>
-      </component>-->
+      <component id="browserplugins_build" filter="s60" name="Browser Plugins Build">
+		<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+        <unit bldFile="browserplugins/group"/>
+      </component>
     </collection>
     <collection id="pushmtm" name="Push MTM" level="plugin">
       <component id="pushmtm_help" filter="s60" name="Push MTM Help">
diff -r 262790aa488d -r c94b55c3fb61 symbian3/mw/netprotocols/package_definition.xml
--- a/symbian3/mw/netprotocols/package_definition.xml	Tue Feb 02 19:53:24 2010 +0000
+++ b/symbian3/mw/netprotocols/package_definition.xml	Wed Feb 03 11:49:07 2010 +0000
@@ -1,148 +1,157 @@
 <?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="mw" long-name="Middleware" levels="generic specific">
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
-<collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-<component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-<unit bldFile="/sf/mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="/sf/mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-</component>
-<component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
-<unit bldFile="/sf/mw/netprotocols/applayerprotocols/httpexamples/group" mrp="/sf/mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-</component>
-<component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
-<unit bldFile="/sf/mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="/sf/mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-</component>
-<component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/mw/netprotocols/applayerprotocols/wapbase/Group" mrp="/sf/mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-</component>
-<component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/mw/netprotocols/applayerprotocols/ftpengine/group" mrp="/sf/mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-</component>
-<component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/mw/netprotocols/applayerprotocols/telnetengine/group" mrp="/sf/mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-</component>
-</collection>
-<collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-<component name="uripermissionservices" long-name="URI Permission Services" introduced="tb91" purpose="optional">
-<unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-</component>
-<component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
-<unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-</component>
-<component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-</component>
-<component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-</component>
-</collection>
-<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="netprotocols">
-<unit bldFile="/sf/mw/netprotocols/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="mw" long-name="Middleware" levels="generic specific">
+      <block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
+        <collection name="httpfilters" long-name="HTTP Filters" level="plugin">
+          <component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
+            <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfiltercommon/group"/>
+          </component>
+          <component name="cookie" filter="s60" long-name="Cookie Filter" plugin="Y">
+            <unit bldFile="/sf/mw/netprotocols/httpfilters/cookie/group"/>
+          </component>
+          <component name="deflatefilter" filter="s60" long-name="Deflate Filter" plugin="Y">
+            <unit bldFile="/sf/mw/netprotocols/httpfilters/deflatefilter/group"/>
+          </component>
+          <component name="httpfilteracceptheader" filter="s60" long-name="Accept Header Filter" plugin="Y">
+            <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
+          </component>
+          <component name="httpfilterauthentication" filter="s60" long-name="Authentication Filter" plugin="Y">
+            <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
+          </component>
+          <component name="httpfilterconnhandler" filter="s60" long-name="Connection Handler Fitler" plugin="Y">
+            <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
+          </component>
+          <component name="httpfilteriop" filter="s60" long-name="HTTP IOP Filter" plugin="Y">
+            <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilteriop/group"/>
+          </component>
+          <component name="httpfilterproxy" filter="s60" long-name="HTTP Proxy Filter" plugin="Y">
+            <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilterproxy/group"/>
+          </component>
+          <component name="uaproffilter" filter="s60" long-name="UAProf Filter" plugin="Y">
+            <unit bldFile="/sf/mw/netprotocols/httpfilters/uaproffilter/group"/>
+          </component>
+        </collection>
+        <collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
+          <component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional">
+            <unit bldFile="/sf/mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="/sf/mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
+          </component>
+          <component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development">
+            <unit bldFile="/sf/mw/netprotocols/applayerprotocols/httpexamples/group" mrp="/sf/mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
+          </component>
+          <component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional">
+            <unit bldFile="/sf/mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="/sf/mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
+          </component>
+          <component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional">
+            <unit bldFile="/sf/mw/netprotocols/applayerprotocols/wapbase/Group" mrp="/sf/mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
+          </component>
+          <component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional">
+            <unit bldFile="/sf/mw/netprotocols/applayerprotocols/ftpengine/group" mrp="/sf/mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
+          </component>
+          <component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional">
+            <unit bldFile="/sf/mw/netprotocols/applayerprotocols/telnetengine/group" mrp="/sf/mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
+          </component>
+          <component name="httpserviceapi" long-name="HTTP Service API" introduced="TB9.2" purpose="optional">
+            <unit bldFile="/sf/mw/netprotocols/applayerprotocols/httpservice/group" mrp="/sf/mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
+          </component>
+        </collection>
+        <collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
+          <component name="uripermissionservices" long-name="URI Permission Services" introduced="^2" purpose="optional">
+            <unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
+          </component>
+          <component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional">
+            <unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
+          </component>
+          <component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
+          </component>
+          <component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
+          </component>
+        </collection>
+        <collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
+          <component name="netprotocols_plat" filter="s60" long-name="High-level Internet Protocols Platform Interfaces" class="api">
+            <unit bldFile="/sf/mw/netprotocols/netprotocols_plat/group"/>
+          </component>
+          <component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
+            <unit mrp="/sf/mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>
diff -r 262790aa488d -r c94b55c3fb61 symbian3/mw/netprotocols/package_definition_3.0.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/netprotocols/package_definition_3.0.xml	Wed Feb 03 11:49:07 2010 +0000
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="netprotocols" name="High-level Internet Protocols" levels="plugin framework server generic specific">
+    <collection id="httpfilters" name="HTTP Filters" level="plugin">
+      <component id="httpfiltercommon" filter="s60" name="HTTP Filter Common">
+        <unit bldFile="httpfilters/httpfiltercommon/group"/>
+      </component>
+      <component id="cookie" filter="s60" name="Cookie Filter" class="plugin">
+        <unit bldFile="httpfilters/cookie/group"/>
+      </component>
+      <component id="deflatefilter" filter="s60" name="Deflate Filter" class="plugin">
+        <unit bldFile="httpfilters/deflatefilter/group"/>
+      </component>
+      <component id="httpfilteracceptheader" filter="s60" name="Accept Header Filter" class="plugin">
+        <unit bldFile="httpfilters/httpfilteracceptheader/group"/>
+      </component>
+      <component id="httpfilterauthentication" filter="s60" name="Authentication Filter" class="plugin">
+        <unit bldFile="httpfilters/httpfilterauthentication/group"/>
+      </component>
+      <component id="httpfilterconnhandler" filter="s60" name="Connection Handler Fitler" class="plugin">
+        <unit bldFile="httpfilters/httpfilterconnhandler/group"/>
+      </component>
+      <component id="httpfilteriop" filter="s60" name="HTTP IOP Filter" class="plugin">
+        <unit bldFile="httpfilters/httpfilteriop/group"/>
+      </component>
+      <component id="httpfilterproxy" filter="s60" name="HTTP Proxy Filter" class="plugin">
+        <unit bldFile="httpfilters/httpfilterproxy/group"/>
+      </component>
+      <component id="uaproffilter" filter="s60" name="UAProf Filter" class="plugin">
+        <unit bldFile="httpfilters/uaproffilter/group"/>
+      </component>
+    </collection>
+    <collection id="applayerprotocols" name="Application Layer Protocols" level="server">
+      <component id="httptransportfw" name="HTTP Transport Framework" introduced="6.2" purpose="optional">
+        <unit bldFile="applayerprotocols/httptransportfw/group" mrp="applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
+      </component>
+      <component id="httpexamples" name="HTTP Examples" introduced="6.2" purpose="development">
+        <unit bldFile="applayerprotocols/httpexamples/group" mrp="applayerprotocols/httpexamples/group/http_examples.mrp"/>
+      </component>
+      <component id="wappushsupport" name="WAP Push Support" introduced="6.2" purpose="optional">
+        <unit bldFile="applayerprotocols/wappushsupport/Group" mrp="applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
+      </component>
+      <component id="wapbase" name="WAP Base" introduced="6.0" purpose="optional">
+        <unit bldFile="applayerprotocols/wapbase/Group" mrp="applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
+      </component>
+      <component id="ftpengine" name="FTP Engine" introduced="6.0" purpose="optional">
+        <unit bldFile="applayerprotocols/ftpengine/group" mrp="applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
+      </component>
+      <component id="telnetengine" name="Telnet Engine" introduced="6.0" purpose="optional">
+        <unit bldFile="applayerprotocols/telnetengine/group" mrp="applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
+      </component>
+      <component id="httpserviceapi" name="HTTP Service API" introduced="TB9.2" purpose="optional">
+        <unit bldFile="applayerprotocols/httpservice/group" mrp="applayerprotocols/httpservice/group/http_service.mrp"/>
+      </component>
+    </collection>
+    <collection id="applayerpluginsandutils" name="Application Layer Plugins and Utils" level="framework">
+      <component id="uripermissionservices" name="URI Permission Services" introduced="^2" purpose="optional">
+        <unit bldFile="applayerpluginsandutils/uripermissionservices/group" mrp="applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
+      </component>
+      <component id="bookmarksupport" name="Bookmark Support" introduced="9.1" purpose="optional">
+        <unit bldFile="applayerpluginsandutils/bookmarksupport/group" mrp="applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
+      </component>
+      <component id="httpprotocolplugins" name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" class="plugin">
+        <unit bldFile="applayerpluginsandutils/httpprotocolplugins/group" mrp="applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
+      </component>
+      <component id="httptransportplugins" name="HTTP Transport Plugins" introduced="6.2" purpose="optional" class="plugin">
+        <unit bldFile="applayerpluginsandutils/httptransportplugins/group" mrp="applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
+      </component>
+    </collection>
+    <collection id="netprotocols_info" name="High-level Internet Protocols Info" level="specific">
+      <component id="netprotocols_plat" filter="s60" name="High-level Internet Protocols Platform Interfaces" class="api">
+        <unit bldFile="netprotocols_plat/group"/>
+      </component>
+      <component id="netprotocols_metadata" name="High-level Internet Protocols Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r 262790aa488d -r c94b55c3fb61 symbian3/mw/opensrv/package_definition.xml
--- a/symbian3/mw/opensrv/package_definition.xml	Tue Feb 02 19:53:24 2010 +0000
+++ b/symbian3/mw/opensrv/package_definition.xml	Wed Feb 03 11:49:07 2010 +0000
@@ -78,22 +78,19 @@
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
         <collection name="loudmouth" long-name="Loudmouth" level="prt">
+          <!-- collection is really a component so it needs to be moved down a directory -->
           <component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
             <unit bldFile="/sf/mw/opensrv/loudmouth/group"/>
           </component>
-          <component name="loudmouth_test" filter="s60" long-name="Loudmouth Test" purpose="development" introduced="^2" class="placeholder">
-            <!-- <unit bldFile="loudmouth/tsrc/group"/> -->
-          </component>
         </collection>
         <collection name="libtelepathy" long-name="Telepathy Library" level="lib">
+          <!-- collection is really a component so it needs to be moved down a directory -->
           <component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
             <unit bldFile="/sf/mw/opensrv/libtelepathy/group"/>
           </component>
-          <component name="libtelepathy_test" filter="s60" long-name="Telepathy Library Test" purpose="development" introduced="^2" class="placeholder">
-            <!-- <unit bldFile="libtelepathy/tsrc/group"/> -->
-          </component>
         </collection>
         <collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
+          <!-- collection is really a component so it needs to be moved down a directory -->
           <component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
             <unit bldFile="/sf/mw/opensrv/telepathygabble/group"/>
           </component>
@@ -105,17 +102,14 @@
           <component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
             <unit bldFile="/sf/mw/opensrv/isolationserver/isoserver/group"/>
           </component>
-          <component name="isolationserver_test" filter="s60" long-name="Isloation Server Test" purpose="development" introduced="^2" class="placeholder">
-            <!-- <unit bldFile="isolationserver/tsrc/group"/> -->
-          </component>
           <component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
+            <!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
             <unit bldFile="/sf/mw/opensrv/isolationserver/group"/>
           </component>
         </collection>
         <collection name="opensrv_info" long-name="Open Services Info" level="eng">
           <component name="opensrv_plat" filter="s60" long-name="Open Services Platform Interfaces" introduced="^2" class="api">
             <unit bldFile="/sf/mw/opensrv/opensrv_plat/group"/>
-            <!-- <unit bldFile="opensrv_plat/messagequeue_api/tsrc/group"/> -->
           </component>
         </collection>
       </block>
diff -r 262790aa488d -r c94b55c3fb61 symbian3/mw/opensrv/package_definition_3.0.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/opensrv/package_definition_3.0.xml	Wed Feb 03 11:49:07 2010 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="opensrv" name="Open Services" levels="prt lib server eng">
+    <collection id="loudmouth" name="Loudmouth" level="prt">
+      <component id="loudmouth_build" filter="s60" name="Loudmouth Build" introduced="^2">
+        <unit bldFile="loudmouth/group"/>
+      </component>
+      <component id="loudmouth_test" filter="s60" name="Loudmouth Test" purpose="development" introduced="^2">
+        <!-- <unit bldFile="loudmouth/tsrc/group"/> -->
+      </component>
+    </collection>
+    <collection id="libtelepathy" name="Telepathy Library" level="lib">
+      <component id="libtelepathy_build" filter="s60" name="Telepathy Library Build" introduced="^2">
+        <unit bldFile="libtelepathy/group"/>
+      </component>
+      <component id="libtelepathy_test" filter="s60" name="Telepathy Library Test" purpose="development" introduced="^2">
+        <!-- <unit bldFile="libtelepathy/tsrc/group"/> -->
+      </component>
+    </collection>
+    <collection id="telepathygabble" name="Telepathy Gabble" level="eng">
+      <component id="telepathygabble_build" filter="s60" name="Telepathy Gabble Build" introduced="^2">
+        <unit bldFile="telepathygabble/group"/>
+      </component>
+    </collection>
+    <collection id="isolationserver" name="Isolation Server" level="server">
+      <component id="messagequeue" filter="s60" name="Message Queue" introduced="^2">
+        <unit bldFile="isolationserver/messagequeue/group"/>
+      </component>
+      <component id="isoserver" filter="s60" name="ISO Server" introduced="^2">
+        <unit bldFile="isolationserver/isoserver/group"/>
+      </component>
+      <component id="isolationserver_test" filter="s60" name="Isloation Server Test" purpose="development" introduced="^2">
+        <!-- <unit bldFile="isolationserver/tsrc/group"/> -->
+      </component>
+      <component id="isolationserver_build" filter="s60" name="Isloation Server Build" introduced="^2">
+        <unit bldFile="isolationserver/group"/>
+      </component>
+    </collection>
+    <collection id="opensrv_info" name="Open Services Info" level="eng">
+      <component id="opensrv_plat" filter="s60" name="Open Services Platform Interfaces" class="api" introduced="^2">
+        <unit bldFile="opensrv_plat/group"/>
+        <!-- <unit bldFile="opensrv_plat/messagequeue_api/tsrc/group"/> -->
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r 262790aa488d -r c94b55c3fb61 symbian3/mw/phonesrv/package_definition.xml
--- a/symbian3/mw/phonesrv/package_definition.xml	Tue Feb 02 19:53:24 2010 +0000
+++ b/symbian3/mw/phonesrv/package_definition.xml	Wed Feb 03 11:49:07 2010 +0000
@@ -77,9 +77,12 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <block name="phonesrv" level="specific" long-name="Telephony and SIM Services" levels="plugin framework server generic specific">
-        <collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
-          <component name="phonecmdhnlr" filter="s60" long-name="Phone Command Handler">
-            <unit bldFile="/sf/mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
+        <collection name="telutils" long-name="Telephony Utils" level="generic">
+          <component name="phoneparser" filter="s60" long-name="Phone Parser">
+            <unit bldFile="/sf/mw/phonesrv/telutils/phoneparser/group"/>
+          </component>
+          <component name="telephonyservice" filter="s60" long-name="Telephony Service">
+            <unit bldFile="/sf/mw/phonesrv/telutils/telephonyservice/group"/>
           </component>
         </collection>
         <collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
@@ -90,6 +93,26 @@
             <unit bldFile="/sf/mw/phonesrv/cbs/cbsui/group"/>
           </component>
         </collection>
+        <collection name="cellular" long-name="Cellular" level="server">
+          <component name="telephonysettings" filter="s60" long-name="Telephony Settings">
+            <unit bldFile="/sf/mw/phonesrv/cellular/telephonysettings/group"/>
+          </component>
+          <component name="sssettings" filter="s60" long-name="Supplementary Service Settings">
+            <unit bldFile="/sf/mw/phonesrv/cellular/sssettings/group"/>
+          </component>
+          <component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI">
+            <unit bldFile="/sf/mw/phonesrv/cellular/psetnotesui/group"/>
+          </component>
+          <component name="servicerequest" filter="s60" long-name="Service Request">
+            <unit bldFile="/sf/mw/phonesrv/cellular/servicerequest/group"/>
+          </component>
+          <component name="cellular_test" filter="s60,api_test" long-name="Cellular Tests" purpose="development">
+            <!-- can only have one unit. Need to #include from a single bld.inf  (cellular/tsrc/bld.inf?) -->
+            <unit bldFile="/sf/mw/phonesrv/cellular/PsetNotesUi/tsrc/public/basic/group"/>
+            <unit bldFile="/sf/mw/phonesrv/cellular/SSSettings/tsrc/public/basic/group"/>
+            <unit bldFile="/sf/mw/phonesrv/cellular/telephonysettings/tsrc/public/basic/group"/>
+          </component>
+        </collection>
         <collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
           <component name="callprovider" filter="s60" long-name="Call Provider">
             <unit bldFile="/sf/mw/phonesrv/convergedcallengine/callprovider/group"/>
@@ -99,9 +122,6 @@
           </component>
           <component name="spsettings" filter="s60" long-name="Service Provider Settings">
             <unit bldFile="/sf/mw/phonesrv/convergedcallengine/spsettings/group"/>
-            <!-- include the rest in the above? -->
-            <!-- <unit bldFile="convergedcallengine/spsettings/tsrc/public/basic/group"/> -->
-            <!-- <unit bldFile="convergedcallengine/spsettings/tsrc/public/basic/spsettingsut/group"/> -->
           </component>
           <component name="cenrepdatabase" filter="s60" long-name="CCE Cenrep Database">
             <unit bldFile="/sf/mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
@@ -113,6 +133,16 @@
             <!--  should spell out CS in name -->
             <unit bldFile="/sf/mw/phonesrv/convergedcallengine/csplugin/group"/>
           </component>
+          <component name="convergedcallengine_test" filter="s60,api_test" long-name="CCE Tests" purpose="development">
+            <!-- can only have one unit. Need to #include from a single bld.inf  (convergedcallengine/tsrc/bld.inf?) -->
+            <unit bldFile="/sf/mw/phonesrv/convergedcallengine/cce/tsrc/public/basic/group"/>
+            <unit bldFile="/sf/mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/group"/>
+          </component>
+        </collection>
+        <collection name="engines" long-name="Telephony Engines" level="specific">
+          <component name="vmbxengine" filter="s60" long-name="Voice Mailbox Engine">
+            <unit bldFile="/sf/mw/phonesrv/engines/vmbxengine/group"/>
+          </component>
         </collection>
         <collection name="networkhandling" long-name="Network Handling" level="plugin">
           <component name="networkhandlingengine" filter="s60" long-name="Network Handling Engine">
@@ -138,8 +168,14 @@
           <component name="callui" filter="s60" long-name="Call UI">
             <unit bldFile="/sf/mw/phonesrv/phoneclientserver/callui/group"/>
           </component>
+          <component name="phoneclientserver_test" filter="s60,api_test" long-name="Phone Client/Server Tests" purpose="development">
+            <!-- can only have one unit. Need to #include from a single bld.inf  (phoneclientserver/tsrc/bld.inf?) -->
+            <unit bldFile="/sf/mw/phonesrv/phoneclientserver/aiwdialdata/tsrc/public/basic/group"/>
+            <unit bldFile="/sf/mw/phonesrv/phoneclientserver/dialutils/tsrc/public/basic/group"/>
+            <unit bldFile="/sf/mw/phonesrv/phoneclientserver/phoneclient/tsrc/public/basic/group"/>
+          </component>
         </collection>
-        <collection name="satengine" long-name="SAT Engine" level="generic">
+        <collection name="satengine" long-name="SIM Application Toolkit Engine" level="generic">
           <component name="satserver" filter="s60" long-name="SAT Server">
             <unit bldFile="/sf/mw/phonesrv/satengine/satserver/group"/>
           </component>
@@ -152,46 +188,27 @@
             <unit bldFile="/sf/mw/phonesrv/satui/satplugin/group"/>
           </component>
         </collection>
-        <collection name="telutils" long-name="Telephony Utils" level="generic">
-          <component name="phoneparser" filter="s60" long-name="Phone Parser">
-            <unit bldFile="/sf/mw/phonesrv/telutils/phoneparser/group"/>
-          </component>
-          <component name="telephonyservice" filter="s60" long-name="Telephony Service">
-            <unit bldFile="/sf/mw/phonesrv/telutils/telephonyservice/group"/>
-          </component>
-        </collection>
-        <collection name="cellular" long-name="Cellular" level="server">
-          <component name="telephonysettings" filter="s60" long-name="Telephony Settings">
-            <unit bldFile="/sf/mw/phonesrv/cellular/telephonysettings/group"/>
-          </component>
-          <component name="sssettings" filter="s60" long-name="Supplementary Service Settings">
-            <unit bldFile="/sf/mw/phonesrv/cellular/sssettings/group"/>
-          </component>
-          <component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI">
-            <unit bldFile="/sf/mw/phonesrv/cellular/psetnotesui/group"/>
-          </component>
-          <component name="servicerequest" filter="s60" long-name="Service Request">
-            <unit bldFile="/sf/mw/phonesrv/cellular/servicerequest/group"/>
-          </component>
-        </collection>
-        <collection name="engines" long-name="Telephony Engines" level="specific">
-          <component name="vmbxengine" filter="s60" long-name="Voice Mailbox Engine">
-            <unit bldFile="/sf/mw/phonesrv/engines/vmbxengine/group"/>
+        <collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
+          <component name="phonecmdhnlr" filter="s60" long-name="Phone Command Handler">
+            <unit bldFile="/sf/mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
           </component>
         </collection>
         <collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific">
           <component name="phonesrv_plat" filter="s60" long-name="Telephony and SIM Services Platform Interfaces" class="api">
             <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/group"/>
-            <!-- include the rest in the above? -->
-            <!-- <unit bldFile="phonesrv_plat/call_information_api/tsrc/group"/> -->
-            <!-- <unit bldFile="phonesrv_plat/call_information_mediator_api/tsrc/ut_callinfos/group"/> -->
-            <!-- <unit bldFile="phonesrv_plat/phone_client_emergency_call_api/tsrc/group"/> -->
-            <!-- <unit bldFile="phonesrv_plat/sat_client_api/tsrc/group"/> -->
-            <!-- <unit bldFile="phonesrv_plat/sat_refresh_api/tsrc/group"/> -->
           </component>
           <component name="phonesrv_pub" filter="s60" long-name="Telephony and SIM Services Public Interfaces" class="api">
             <unit bldFile="/sf/mw/phonesrv/phonesrv_pub/group"/>
           </component>
+          <component name="phonesrv_test" filter="s60,api_test" long-name="Telephony and SIM Services Tests" purpose="development">
+            <!-- can only have one unit. Need to #include from a single bld.inf  (phonesrv_plat/tsrc/bld.inf?) -->
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_service_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/telephony_mediator_api/tsrc/ut_telephony_mediator_api/group"/>
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_remote_party_information_api/tsrc/group"/>
+          </component>
         </collection>
       </block>
     </layer>
diff -r 262790aa488d -r c94b55c3fb61 symbian3/mw/phonesrv/package_definition_3.0.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/phonesrv/package_definition_3.0.xml	Wed Feb 03 11:49:07 2010 +0000
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="phonesrv" name="Telephony and SIM Services" levels="plugin framework server generic specific">
+    <collection id="phonecmdhandler" name="Phone Command Handler" level="generic">
+      <component id="phonecmdhnlr" filter="s60" name="Phone Command Handler">
+        <unit bldFile="phonecmdhandler/phonecmdhnlr/group"/>
+      </component>
+    </collection>
+    <collection id="cbs" name="Cellular Baseband Services" level="plugin">
+      <component id="cbsserver" filter="s60" name="CBS Server">
+        <unit bldFile="cbs/cbsserver/group"/>
+      </component>
+      <component id="cbsui" filter="s60" name="CBS UI">
+        <unit bldFile="cbs/cbsui/group"/>
+      </component>
+    </collection>
+    <collection id="convergedcallengine" name="Converged Call Engine" level="framework">
+      <component id="callprovider" filter="s60" name="Call Provider">
+        <unit bldFile="convergedcallengine/callprovider/group"/>
+      </component>
+      <component id="cce" filter="s60" name="CCE">
+        <unit bldFile="convergedcallengine/cce/group"/>
+      </component>
+      <component id="spsettings" filter="s60" name="Service Provider Settings">
+        <unit bldFile="convergedcallengine/spsettings/group"/>
+        	<!-- include the rest in the above? -->
+        <!-- <unit bldFile="convergedcallengine/spsettings/tsrc/public/basic/group"/> -->
+        <!-- <unit bldFile="convergedcallengine/spsettings/tsrc/public/basic/spsettingsut/group"/> -->
+      </component>
+      <component id="cenrepdatabase" filter="s60" name="CCE Cenrep Database">
+        <unit bldFile="convergedcallengine/cenrepdatabase/group"/>
+      </component>
+      <component id="serviceselector" filter="s60" name="Service Selector">
+        <unit bldFile="convergedcallengine/serviceselector/group"/>
+      </component>
+      <component id="csplugin" filter="s60" name="CS Plugin" class="plugin">
+      	<!--  should spell out CS in name -->
+        <unit bldFile="convergedcallengine/csplugin/group"/>
+      </component>
+    </collection>
+    <collection id="networkhandling" name="Network Handling" level="plugin">
+      <component id="networkhandlingengine" filter="s60" name="Network Handling Engine">
+        <unit bldFile="networkhandling/networkhandlingengine/group"/>
+      </component>
+    </collection>
+    <collection id="phoneclientserver" name="Phone Client/Server" level="server">
+      <component id="enpolicy" filter="s60" name="Emergency Number Policy">
+        <unit bldFile="phoneclientserver/enpolicy/group"/>
+      </component>
+      <component id="aiwdialdata" filter="s60" name="AIW Dial Data">
+        <unit bldFile="phoneclientserver/aiwdialdata/group"/>
+      </component>
+      <component id="dialutils" filter="s60" name="Dial Utils">
+        <unit bldFile="phoneclientserver/dialutils/group"/>
+      </component>
+      <component id="phoneclient" filter="s60" name="Phone Client">
+        <unit bldFile="phoneclientserver/phoneclient/group"/>
+      </component>
+      <component id="phoneserver" filter="s60" name="Phone Server">
+        <unit bldFile="phoneclientserver/phoneserver/group"/>
+      </component>
+      <component id="callui" filter="s60" name="Call UI">
+        <unit bldFile="phoneclientserver/callui/group"/>
+      </component>
+    </collection>
+    <collection id="satengine" name="SAT Engine" level="generic">
+      <component id="satserver" filter="s60" name="SAT Server">
+        <unit bldFile="satengine/satserver/group"/>
+      </component>
+    </collection>
+    <collection id="satui" name="SIM Application Toolkit UI" level="specific">
+      <component id="satapp" filter="s60" name="SAT Application">
+        <unit bldFile="satui/satapp/group"/>
+      </component>
+      <component id="satplugin" filter="s60" name="SAT Plugin" class="plugin">
+        <unit bldFile="satui/satplugin/group"/>
+      </component>
+    </collection>
+    <collection id="telutils" name="Telephony Utils" level="generic">
+      <component id="phoneparser" filter="s60" name="Phone Parser">
+        <unit bldFile="telutils/phoneparser/group"/>
+      </component>
+      <component id="telephonyservice" filter="s60" name="Telephony Service">
+        <unit bldFile="telutils/telephonyservice/group"/>
+      </component>
+    </collection>
+    <collection id="cellular" name="Cellular" level="server">
+      <component id="telephonysettings" filter="s60" name="Telephony Settings">
+        <unit bldFile="cellular/telephonysettings/group"/>
+      </component>
+      <component id="sssettings" filter="s60" name="Supplementary Service Settings">
+        <unit bldFile="cellular/sssettings/group"/>
+      </component>
+      <component id="psetnotesui" filter="s60" name="Phone Settings Notes UI">
+        <unit bldFile="cellular/psetnotesui/group"/>
+      </component>
+      <component id="servicerequest" filter="s60" name="Service Request">
+        <unit bldFile="cellular/servicerequest/group"/>
+      </component>
+    </collection>
+    <collection id="engines" name="Telephony Engines" level="specific">
+      <component id="vmbxengine" filter="s60" name="Voice Mailbox Engine">
+        <unit bldFile="engines/vmbxengine/group"/>
+      </component>
+    </collection>
+    <collection id="phonesrv_info" name="Telephony and SIM Services Info" level="specific">
+      <component id="phonesrv_plat" filter="s60" name="Telephony and SIM Services Platform Interfaces" class="api">
+        <unit bldFile="phonesrv_plat/group"/>
+        	<!-- include the rest in the above? -->
+        <!-- <unit bldFile="phonesrv_plat/call_information_api/tsrc/group"/> -->
+        <!-- <unit bldFile="phonesrv_plat/call_information_mediator_api/tsrc/ut_callinfos/group"/> -->
+        <!-- <unit bldFile="phonesrv_plat/phone_client_emergency_call_api/tsrc/group"/> -->
+        <!-- <unit bldFile="phonesrv_plat/sat_client_api/tsrc/group"/> -->
+        <!-- <unit bldFile="phonesrv_plat/sat_refresh_api/tsrc/group"/> -->
+      </component>
+      <component id="phonesrv_pub" filter="s60" name="Telephony and SIM Services Public Interfaces" class="api">
+        <unit bldFile="phonesrv_pub/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r 262790aa488d -r c94b55c3fb61 symbian3/mw/platformtools/package_definition.xml
--- a/symbian3/mw/platformtools/package_definition.xml	Tue Feb 02 19:53:24 2010 +0000
+++ b/symbian3/mw/platformtools/package_definition.xml	Wed Feb 03 11:49:07 2010 +0000
@@ -78,13 +78,11 @@
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <block name="platformtools" level="generic" long-name="Platform Tools">
         <collection name="gfxconversion" long-name="Graphics Conversion">
-          <component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter">
-            <!-- component need to be moved to appropriate location -->
-            <unit bldFile="/sf/tools/platformtools/gfxconversion/bmconv_s60/group"/>
+          <component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
+            <unit bldFile="/sf/mw/platformtools/gfxconversion/bmconv_s60/group"/>
           </component>
-          <component name="mifconv" filter="s60" long-name="Multi Icon File Converter">
-            <!-- component need to be moved to appropriate location -->
-            <unit bldFile="/sf/tools/platformtools/gfxconversion/mifconv/group"/>
+          <component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
+            <unit bldFile="/sf/mw/platformtools/gfxconversion/mifconv/group"/>
           </component>
         </collection>
       </block>
diff -r 262790aa488d -r c94b55c3fb61 symbian3/mw/platformtools/package_definition_3.0.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/platformtools/package_definition_3.0.xml	Wed Feb 03 11:49:07 2010 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="platformtools" name="Platform Tools">
+    <collection id="gfxconversion" name="Graphics Conversion">
+      <component id="bmconv_s60" filter="s60" name="S60 Bitmap Converter">
+			<!-- component need to be moved to appropriate location -->
+        <unit bldFile="/tools/platformtools/gfxconversion/bmconv_s60/group"/>
+      </component>
+      <component id="mifconv" filter="s60" name="Multi Icon File Converter">
+			<!-- component need to be moved to appropriate location -->
+        <unit bldFile="/tools/platformtools/gfxconversion/mifconv/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r 262790aa488d -r c94b55c3fb61 symbian3/mw/remoteconn/package_definition_3.0.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/remoteconn/package_definition_3.0.xml	Wed Feb 03 11:49:07 2010 +0000
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="remoteconn" name="Remote Connectivity" levels="plugin framework server generic specific">
+    <collection id="connectivitymodules" name="Connectivity Modules" level="framework">
+      <component id="secon" filter="s60" name="Service Controllers">
+        <unit bldFile="connectivitymodules/secon/group"/>
+      </component>
+    </collection>
+    <collection id="remoteconn_info" name="Remote Connectivity Info" level="specific">
+      <component id="remoteconn_plat" filter="s60" name="Remote Connectivity Platform Interfaces" class="api">
+        <unit bldFile="remoteconn_plat/group"/>
+      </component>
+      <component id="remoteconn_metadata" name="Remote Connectivity Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
+      </component>
+    </collection>
+    <collection id="mtptransports" name="MTP Transports" level="plugin">
+      <component id="mtpusbtransport" name="MTP USB Transport" introduced="^2" purpose="optional" class="plugin">
+        <unit bldFile="mtptransports/mtpusbtransport/group" mrp="mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
+      </component>
+      <component id="mtpptpiptransport" name="MTP PTP-IP Transport" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="mtptransports/mtpptpiptransport/group" mrp="mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
+      </component>
+      <component id="mtpcontroller" name="MTP Controller" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="mtptransports/mtpcontroller/group" mrp="mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
+      </component>
+    </collection>
+    <collection id="mtpfws" name="MTP Frameworks" level="framework">
+      <component id="mtpfw" name="MTP Framework" introduced="^2" purpose="optional">
+        <unit bldFile="mtpfws/mtpfw/group" mrp="mtpfws/mtpfw/group/mtp_framework.mrp"/>
+      </component>
+      
+    </collection>
+    <collection id="mtpdataproviders" name="MTP Data Providers" level="generic">
+      <component id="mtpfileandfolderdp" name="MTP File and Folder Provider" introduced="^2" purpose="optional" class="plugin">
+        <unit bldFile="mtpdataproviders/mtpfileandfolderdp/group" mrp="mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
+      </component>
+    </collection>
+    <collection id="backupandrestore" name="Backup and Restore" level="specific">
+      <component id="backupengine" name="Backup Engine" introduced="9.0" purpose="optional">
+        <unit bldFile="backupandrestore/backupengine/group" mrp="backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
+      </component>
+     <component id="backuptest" name="Backup Test" introduced="^2" purpose="development">
+        <unit bldFile="backupandrestore/backuptest/group" mrp="backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
+      </component>
+    </collection>
+    <collection id="obex" name="OBEX" level="generic">
+      <component id="obexprotocol" name="OBEX Protocol" introduced="9.1" purpose="optional">
+        <unit bldFile="obex/obexprotocol/group" mrp="obex/obexprotocol/group/obex.mrp"/>
+      </component>
+      <component id="obexextensionapi" name="OBEX Extension API" introduced="9.2" purpose="optional">
+        <unit bldFile="obex/obexextensionapi/group" mrp="obex/obexextensionapi/group/obex_extensionapis.mrp"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r 262790aa488d -r c94b55c3fb61 symbian3/mw/shortlinkconn/package_definition.xml
--- a/symbian3/mw/shortlinkconn/package_definition.xml	Tue Feb 02 19:53:24 2010 +0000
+++ b/symbian3/mw/shortlinkconn/package_definition.xml	Wed Feb 03 11:49:07 2010 +0000
@@ -1,109 +1,124 @@
 <?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="mw">
-<block name="shortlinkconn">
-<collection name="s60">
-<component name="shortlinkconn">
-<unit bldFile="/sf/mw/shortlinkconn/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!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="mw" long-name="Middleware" levels="generic specific">
+      <block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
+        <!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
+        <collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
+          <component name="locod" long-name="Local Connectivity Daemon">
+            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/locod/group"/>
+          </component>
+          <component name="obexserviceman" long-name="OBEX Service Managar">
+            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
+          </component>
+          <component name="obexsendservices" long-name="OBEX Send Services">
+            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
+          </component>
+          <component name="obexreceiveservices" long-name="OBEX Receive Services">
+            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
+          </component>
+          <component name="dun" long-name="Dial Up Networking">
+            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/dun/group"/>
+          </component>
+          <component name="lccustomplugin" long-name="LC Custom Plugins" plugin="Y">
+            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/lccustomplugin/group"/>
+          </component>
+          <component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
+            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
+          </component>
+          <component name="legacymodemplugin" long-name="Legacy Modem Plugin" plugin="Y">
+            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/legacymodemplugin/group"/>
+          </component>
+          <component name="modematplugin" long-name="Modem AT Plugin" plugin="Y">
+            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/modematplugin/group"/>
+          </component>
+          <component name="generichid" long-name="Generic HID">
+            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/generichid/group"/>
+          </component>
+          <component name="headset" long-name="Headset">
+            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/headset/group"/>
+          </component>
+        </collection>
+        <collection name="shortlinkconn_info" long-name="Shortlink Connectivity Info" level="plugin">
+          <component name="shortlinkconn_plat" filter="s60" long-name="Shortlink Connectivity Platform Interfaces" class="api">
+            <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/group"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
 </SystemDefinition>
diff -r 262790aa488d -r c94b55c3fb61 symbian3/mw/shortlinkconn/package_definition_3.0.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/shortlinkconn/package_definition_3.0.xml	Wed Feb 03 11:49:07 2010 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="shortlinkconn" name="Shortlink Connectivity" levels="framework server generic specific plugin">
+  	<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
+    <collection id="localconnectivityservice" name="Local Connectivity Service" level="server">
+		<component id="locod" name="Local Connectivity Daemon">
+			<unit bldFile="localconnectivityservice/locod/group"/>
+		</component>	
+		<component id="obexserviceman" name="OBEX Service Managar">
+			<unit bldFile="localconnectivityservice/obexserviceman/group"/>
+		</component>
+		<component id="obexsendservices" name="OBEX Send Services">
+			<unit bldFile="localconnectivityservice/obexsendservices/group"/>
+		</component>
+		<component id="obexreceiveservices" name="OBEX Receive Services">
+			<unit bldFile="localconnectivityservice/obexreceiveservices/group"/>
+		</component>
+		<component id="dun" name="Dial Up Networking">
+			<unit bldFile="localconnectivityservice/dun/group"/>
+		</component>
+		<component id="lccustomplugin" name="LC Custom Plugins" class="plugin">
+			<unit bldFile="localconnectivityservice/lccustomplugin/group"/>
+		</component>
+		<component id="lcstylustap" name="LC Stylus Tap Plugins" class="plugin">
+			<unit bldFile="localconnectivityservice/lcstylustap/group"/>
+		</component>
+		<component id="legacymodemplugin" name="Legacy Modem Plugin" class="plugin">
+			<unit bldFile="localconnectivityservice/legacymodemplugin/group"/>
+		</component>
+		<component id="modematplugin" name="Modem AT Plugin" class="plugin">
+			<unit bldFile="localconnectivityservice/modematplugin/group"/>
+		</component>
+		<component id="generichid" name="Generic HID">
+			<unit bldFile="localconnectivityservice/generichid/group"/>
+		</component>
+		<component id="headset" name="Headset">
+			<unit bldFile="localconnectivityservice/headset/group"/>
+		</component>
+    </collection>
+    <collection id="shortlinkconn_info" name="Shortlink Connectivity Info" level="plugin">
+      <component id="shortlinkconn_plat" filter="s60" name="Shortlink Connectivity Platform Interfaces" class="api">
+        <unit bldFile="shortlinkconn_plat/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r 262790aa488d -r c94b55c3fb61 symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml
--- a/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Tue Feb 02 19:53:24 2010 +0000
+++ b/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Wed Feb 03 11:49:07 2010 +0000
@@ -141,13 +141,13 @@
       <package id="legacypresence" level="specific" tech-domain="pr" href="../../../../mw/legacypresence/package_definition_3.0.xml"/>
       <package id="opensrv" level="specific" tech-domain="pr" href="../../../../mw/opensrv/package_definition_3.0.xml"/>
       <package id="remotemgmt" level="specific" tech-domain="dm" href="../../../../mw/remotemgmt/package_definition_3.0.xml"/>
-      <package id="networkingdm" level="generic" tech-domain="dm" href="../../../../mw/networkingdm/package_definition_3.0.xml"/>
       <package id="remotestorage" level="generic" tech-domain="de" href="../../../../mw/remotestorage/package_definition_3.0.xml"/>
       <package id="remoteconn" level="generic" tech-domain="de" href="../../../../mw/remoteconn/package_definition_3.0.xml"/>
       <package id="srvdiscovery" level="generic" tech-domain="de" href="../../../../mw/srvdiscovery/package_definition_3.0.xml"/>
       <package id="dlnasrv" level="specific" tech-domain="de" href="../../../../mw/dlnasrv/package_definition_3.0.xml"/>
       <package id="btservices" level="generic" tech-domain="de" href="../../../../mw/btservices/package_definition_3.0.xml"/>
       <package id="usbservices" level="generic" tech-domain="de" href="../../../../mw/usbservices/package_definition_3.0.xml"/>
+      <package id="shortlinkconn" level="generic" tech-domain="de" href="../../../../mw/shortlinkconn/package_definition_3.0.xml"/>
       <package id="imghandling" level="specific" tech-domain="mm" href="../../../../mw/imghandling/package_definition_3.0.xml"/>
       <package id="metadatasrv" level="specific" tech-domain="mm" href="../../../../mw/metadatasrv/package_definition_3.0.xml"/>
       <package id="mds" level="specific" tech-domain="mm" href="../../../../mw/mds/package_definition_3.0.xml"/>