--- a/CompilerCompatibility/os/networkingsrv/package_definition.xml	Fri Sep 17 18:31:50 2010 +0100
+++ b/CompilerCompatibility/os/networkingsrv/package_definition.xml	Wed Sep 22 14:02:51 2010 +0100
@@ -54,6 +54,11 @@
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+<collection name="commsdb" long-name="Comms DB" level="server">
+<component name="s60_commsdb" filter="s60" long-name="S60 Commsdb" class="config">
+<unit bldFile="/sf/os/networkingsrv/commsdb/s60_commsdb/group"/>
+</component>
+</collection>
 <collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
 <component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory">
 <unit bldFile="/sf/os/networkingsrv/esockapiextensions/internetsockets/group" mrp="/sf/os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
@@ -72,6 +77,9 @@
 <component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
 <unit bldFile="/sf/os/networkingsrv/tcpiputils/punycodeconv/group" mrp="/sf/os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
 </component>
+<component name="tun" long-name="Tun Hook" introduced="^3" purpose="mandatory">
+<unit bldFile="/sf/os/networkingsrv/tcpiputils/tun/group" mrp="/sf/os/networkingsrv/tcpiputils/tun/group/networking_tun.mrp"/>
+</component>
 </collection>
 <collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
 <component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
@@ -86,6 +94,9 @@
 <component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
 <unit bldFile="/sf/os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="/sf/os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
 </component>
+<component name="tundriveragt" long-name="Tun Driver Agent" introduced="^3" purpose="mandatory" plugin="Y">
+<unit bldFile="/sf/os/networkingsrv/linklayercontrol/tundriveragt/group" mrp="/sf/os/networkingsrv/linklayercontrol/tundriveragt/group/networking_tundriveragt.mrp"/>
+</component>
 </collection>
 <collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
 <component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
@@ -100,6 +111,9 @@
 <component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
 </component>
+<component name="tundriver" long-name="Tun Driver" introduced="^3" purpose="mandatory" plugin="Y">
+<unit bldFile="/sf/os/networkingsrv/linklayerprotocols/tundriver/group" mrp="/sf/os/networkingsrv/linklayerprotocols/tundriver/group/networking_tundriver.mrp"/>
+</component>
 </collection>
 <collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
 <component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
@@ -161,6 +175,12 @@
 <component name="networkingexamples" long-name="Networking Examples" introduced="7.0" purpose="development">
 <unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/>
 </component>
+<component name="networkingintegrationtest" long-name="Networking Integration Test" introduced="ER5" purpose="development">
+<unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
+</component>
+<component name="networkingperformancemeasurementtools" long-name="Networking Performance Measurement Tools" introduced="^3" purpose="development">
+<unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group/networking_netperf.mrp"/>
+</component>
 </collection>
 <collection name="networkingsrv_info" long-name="Networking Services Info" level="app-if">
 <component name="networkingrom" long-name="Networking ROM" purpose="mandatory">

--- a/symbian3/os/networkingsrv/package_definition.xml	Fri Sep 17 18:31:50 2010 +0100
+++ b/symbian3/os/networkingsrv/package_definition.xml	Wed Sep 22 14:02:51 2010 +0100
@@ -54,6 +54,11 @@
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+<collection name="commsdb" long-name="Comms DB" level="server">
+<component name="s60_commsdb" filter="s60" long-name="S60 Commsdb" class="config">
+<unit bldFile="/sf/os/networkingsrv/commsdb/s60_commsdb/group"/>
+</component>
+</collection>
 <collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
 <component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory">
 <unit bldFile="/sf/os/networkingsrv/esockapiextensions/internetsockets/group" mrp="/sf/os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
@@ -72,6 +77,9 @@
 <component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
 <unit bldFile="/sf/os/networkingsrv/tcpiputils/punycodeconv/group" mrp="/sf/os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
 </component>
+<component name="tun" long-name="Tun Hook" introduced="^3" purpose="mandatory">
+<unit bldFile="/sf/os/networkingsrv/tcpiputils/tun/group" mrp="/sf/os/networkingsrv/tcpiputils/tun/group/networking_tun.mrp"/>
+</component>
 </collection>
 <collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
 <component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
@@ -86,6 +94,9 @@
 <component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
 <unit bldFile="/sf/os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="/sf/os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
 </component>
+<component name="tundriveragt" long-name="Tun Driver Agent" introduced="^3" purpose="mandatory" plugin="Y">
+<unit bldFile="/sf/os/networkingsrv/linklayercontrol/tundriveragt/group" mrp="/sf/os/networkingsrv/linklayercontrol/tundriveragt/group/networking_tundriveragt.mrp"/>
+</component>
 </collection>
 <collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
 <component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
@@ -100,6 +111,9 @@
 <component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
 </component>
+<component name="tundriver" long-name="Tun Driver" introduced="^3" purpose="mandatory" plugin="Y">
+<unit bldFile="/sf/os/networkingsrv/linklayerprotocols/tundriver/group" mrp="/sf/os/networkingsrv/linklayerprotocols/tundriver/group/networking_tundriver.mrp"/>
+</component>
 </collection>
 <collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
 <component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
@@ -161,6 +175,12 @@
 <component name="networkingexamples" long-name="Networking Examples" introduced="7.0" purpose="development">
 <unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/>
 </component>
+<component name="networkingintegrationtest" long-name="Networking Integration Test" introduced="ER5" purpose="development">
+<unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
+</component>
+<component name="networkingperformancemeasurementtools" long-name="Networking Performance Measurement Tools" introduced="^3" purpose="development">
+<unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group/networking_netperf.mrp"/>
+</component>
 </collection>
 <collection name="networkingsrv_info" long-name="Networking Services Info" level="app-if">
 <component name="networkingrom" long-name="Networking ROM" purpose="mandatory">

--- a/tip_bulk_s3/os/networkingsrv/package_definition.xml	Fri Sep 17 18:31:50 2010 +0100
+++ b/tip_bulk_s3/os/networkingsrv/package_definition.xml	Wed Sep 22 14:02:51 2010 +0100
@@ -54,6 +54,11 @@
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+<collection name="commsdb" long-name="Comms DB" level="server">
+<component name="s60_commsdb" filter="s60" long-name="S60 Commsdb" class="config">
+<unit bldFile="/sf/os/networkingsrv/commsdb/s60_commsdb/group"/>
+</component>
+</collection>
 <collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
 <component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory">
 <unit bldFile="/sf/os/networkingsrv/esockapiextensions/internetsockets/group" mrp="/sf/os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
@@ -72,6 +77,9 @@
 <component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
 <unit bldFile="/sf/os/networkingsrv/tcpiputils/punycodeconv/group" mrp="/sf/os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
 </component>
+<component name="tun" long-name="Tun Hook" introduced="^3" purpose="mandatory">
+<unit bldFile="/sf/os/networkingsrv/tcpiputils/tun/group" mrp="/sf/os/networkingsrv/tcpiputils/tun/group/networking_tun.mrp"/>
+</component>
 </collection>
 <collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
 <component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
@@ -86,6 +94,9 @@
 <component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
 <unit bldFile="/sf/os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="/sf/os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
 </component>
+<component name="tundriveragt" long-name="Tun Driver Agent" introduced="^3" purpose="mandatory" plugin="Y">
+<unit bldFile="/sf/os/networkingsrv/linklayercontrol/tundriveragt/group" mrp="/sf/os/networkingsrv/linklayercontrol/tundriveragt/group/networking_tundriveragt.mrp"/>
+</component>
 </collection>
 <collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
 <component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
@@ -100,6 +111,9 @@
 <component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
 </component>
+<component name="tundriver" long-name="Tun Driver" introduced="^3" purpose="mandatory" plugin="Y">
+<unit bldFile="/sf/os/networkingsrv/linklayerprotocols/tundriver/group" mrp="/sf/os/networkingsrv/linklayerprotocols/tundriver/group/networking_tundriver.mrp"/>
+</component>
 </collection>
 <collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
 <component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
@@ -161,6 +175,12 @@
 <component name="networkingexamples" long-name="Networking Examples" introduced="7.0" purpose="development">
 <unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/>
 </component>
+<component name="networkingintegrationtest" long-name="Networking Integration Test" introduced="ER5" purpose="development">
+<unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
+</component>
+<component name="networkingperformancemeasurementtools" long-name="Networking Performance Measurement Tools" introduced="^3" purpose="development">
+<unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group/networking_netperf.mrp"/>
+</component>
 </collection>
 <collection name="networkingsrv_info" long-name="Networking Services Info" level="app-if">
 <component name="networkingrom" long-name="Networking ROM" purpose="mandatory">