--- a/symbian3/os/networkingsrv/package_definition.xml	Mon Mar 15 18:29:08 2010 +0000
+++ b/symbian3/os/networkingsrv/package_definition.xml	Mon Mar 15 18:47:03 2010 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
+ <!ELEMENT SystemDefinition (systemModel)>
  <!ATTLIST SystemDefinition
   name CDATA #REQUIRED
   schema CDATA #REQUIRED>
@@ -49,222 +49,143 @@
   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">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
 <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="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"/>
-</component>
-</collection>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="/sf/os/networkingsrv/tcpiputils/dnd/group" mrp="/sf/os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dndconfig" long-name="DND Config" introduced="7.0" purpose="mandatory" class="config">
-<unit mrp="/sf/os/networkingsrv/tcpiputils/dnd/group/networking_dnd-config.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="/sf/os/networkingsrv/tcpiputils/dhcp/group" mrp="/sf/os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="tb91" purpose="mandatory" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="/sf/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/networkingsrv/tcpiputils/punycodeconv/group" mrp="/sf/os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.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">
-<unit bldFile="/sf/os/networkingsrv/linklayercontrol/nullagt/group" mrp="/sf/os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="/sf/os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="/sf/os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.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">
-<unit bldFile="/sf/os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="ethernetpacketdriver" long-name="Ethernet Packet Driver" introduced="7.0" purpose="optional" plugin="Y">
-<unit mrp="/sf/os/networkingsrv/linklayerprotocols/ethernetpacketdriver/group/networking_etherdrv_srconly.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/linklayerprotocols/pppnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="pppconfig" long-name="PPP Config" introduced="ER5" purpose="optional" class="config">
-<unit mrp="/sf/os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp-config.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/linklayerprotocols/slipnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<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>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="/sf/os/networkingsrv/linklayerutils/packetlogger/group" mrp="/sf/os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qosfwconfig" long-name="QoS Framework Config" introduced="7.0s" purpose="optional" class="config">
-<unit mrp="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos-config.mrp"/>
-</component>
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/qoslib/group" mrp="/sf/os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/pfqoslib/group" mrp="/sf/os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/qosipscpr/group" mrp="/sf/os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="/sf/os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="/sf/os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="/sf/os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-<component name="ipupsplugins" long-name="IP UPS Plugins" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/ipupsplugins/group" mrp="/sf/os/networkingsrv/networkcontrol/ipupsplugins/group/networking_ipups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="tcpipv4config" long-name="TCP/IPv4/v6 Config" introduced="7.0" purpose="mandatory" class="config">
-<unit mrp="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6-config.mrp"/>
-</component>
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="/sf/os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="/sf/os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="/sf/os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkprotocols/mobileip/group" mrp="/sf/os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/networkingsrv/networkprotocols/dnsproxy/group" mrp="/sf/os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="/sf/os/networkingsrv/networksecurity/tls/group" mrp="/sf/os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="/sf/os/networkingsrv/networksecurity/tlsprovider/group" mrp="/sf/os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="/sf/os/networkingsrv/networksecurity/ipsec/group" mrp="/sf/os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<component name="networkingunittest" long-name="Networking Unit Test" introduced="7.0" purpose="development">
-<unit mrp="/sf/os/networkingsrv/networkingtestandutils/networkingunittest/group/networking_unittest.mrp"/>
-</component>
-<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="exampleinternetutilities" long-name="Example Internet Utilities" introduced="ER5" purpose="development">
-<unit mrp="/sf/os/networkingsrv/networkingtestandutils/exampleinternetutilities/group/networking_inetutil.mrp"/>
-</component>
-<component name="ipprobe" long-name="IP Probe" introduced="7.0s" purpose="development" plugin="Y">
-<unit mrp="/sf/os/networkingsrv/networkingtestandutils/ipprobe/group/networking_probe.mrp"/>
-</component>
-<component name="ipv6to4tunnel" long-name="IPv6 to 4 Tunnel" purpose="development" plugin="Y">
-<unit mrp="/sf/os/networkingsrv/networkingtestandutils/ipv6to4tunnel/group/networking_6to4.mrp"/>
-</component>
-<component name="ipanalyzer" long-name="IP Analyzer" deprecated="tb92" introduced="7.0" purpose="development">
-<unit mrp="/sf/os/networkingsrv/networkingtestandutils/ipanalyzer/group/networking_iprotor.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="tb92" 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">
-<!--  production component: contains the IBY files -->
-<unit bldFile="/sf/os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="/sf/os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="/sf/os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="networkingsrv">
-<unit bldFile="/sf/os/networkingsrv/group" mrp=""/>
-</component>
-</collection>
-</block>
+    <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"/>
+     </component>
+    </collection>
+    <collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
+     <component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
+      <unit bldFile="/sf/os/networkingsrv/tcpiputils/dnd/group" mrp="/sf/os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
+     </component>
+     <component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
+      <unit bldFile="/sf/os/networkingsrv/tcpiputils/dhcp/group" mrp="/sf/os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
+     </component>
+     <component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
+      <unit bldFile="/sf/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="/sf/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
+     </component>
+     <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>
+    </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">
+      <unit bldFile="/sf/os/networkingsrv/linklayercontrol/nullagt/group" mrp="/sf/os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
+     </component>
+     <component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
+      <unit bldFile="/sf/os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="/sf/os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
+     </component>
+     <component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
+      <unit bldFile="/sf/os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="/sf/os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
+     </component>
+     <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>
+    </collection>
+    <collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
+     <component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
+      <unit bldFile="/sf/os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
+     </component>
+     <component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
+      <unit bldFile="/sf/os/networkingsrv/linklayerprotocols/pppnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
+     </component>
+     <component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
+      <unit bldFile="/sf/os/networkingsrv/linklayerprotocols/slipnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
+     </component>
+     <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>
+    </collection>
+    <collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
+     <component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
+      <unit bldFile="/sf/os/networkingsrv/linklayerutils/packetlogger/group" mrp="/sf/os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
+     </component>
+    </collection>
+    <collection name="networkcontrol" long-name="Network Control" level="plugin">
+     <component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
+      <unit bldFile="/sf/os/networkingsrv/networkcontrol/qoslib/group" mrp="/sf/os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
+     </component>
+     <component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
+      <unit bldFile="/sf/os/networkingsrv/networkcontrol/pfqoslib/group" mrp="/sf/os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
+     </component>
+     <component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
+      <unit bldFile="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
+     </component>
+     <component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
+      <unit bldFile="/sf/os/networkingsrv/networkcontrol/qosipscpr/group" mrp="/sf/os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
+     </component>
+     <component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
+      <unit bldFile="/sf/os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="/sf/os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
+     </component>
+     <component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
+      <unit bldFile="/sf/os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="/sf/os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
+     </component>
+     <component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
+      <unit bldFile="/sf/os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="/sf/os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
+     </component>
+    </collection>
+    <collection name="networkprotocols" long-name="Network Protocols" level="plugin">
+     <component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
+      <unit bldFile="/sf/os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="/sf/os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
+     </component>
+     <component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
+      <unit bldFile="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
+     </component>
+     <component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
+      <unit bldFile="/sf/os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="/sf/os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
+     </component>
+     <component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
+      <unit bldFile="/sf/os/networkingsrv/networkprotocols/mobileip/group" mrp="/sf/os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
+     </component>
+     <component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
+      <unit bldFile="/sf/os/networkingsrv/networkprotocols/dnsproxy/group" mrp="/sf/os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
+     </component>
+    </collection>
+    <collection name="networksecurity" long-name="Network Security" level="framework">
+     <component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
+      <unit bldFile="/sf/os/networkingsrv/networksecurity/tls/group" mrp="/sf/os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
+     </component>
+     <component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
+      <unit bldFile="/sf/os/networkingsrv/networksecurity/tlsprovider/group" mrp="/sf/os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
+     </component>
+     <component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
+      <unit bldFile="/sf/os/networkingsrv/networksecurity/ipsec/group" mrp="/sf/os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
+     </component>
+    </collection>
+    <collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
+     <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">
+      <!--  production component: contains the IBY files -->
+      <unit bldFile="/sf/os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="/sf/os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
+     </component>
+     <component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
+      <unit mrp="/sf/os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
+     </component>
+     <component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
+      <unit mrp="/sf/os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
+     </component>
+    </collection>
+    <collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
+     <component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
+      <unit bldFile="/sf/os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="/sf/os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
+     </component>
+    </collection>
+   </block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file