--- a/symbian3/mw/ipappprotocols/package_definition.xml	Mon Mar 15 18:29:08 2010 +0000
+++ b/symbian3/mw/ipappprotocols/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,80 +49,59 @@
   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="mw" long-name="Middleware" levels="generic specific">
 <block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
-<collection name="realtimenetprots" long-name="Real-time Internet Protocols" level="server">
-<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
-<!-- Real Time Data Protocol -->
-<unit bldFile="/sf/mw/ipappprotocols/realtimenetprots/rtp/group" mrp="/sf/mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-</component>
-<component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="/sf/mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-</component>
-</collection>
-<collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-<component name="sipprovider" long-name="SIP Provider" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="/sf/mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-</component>
-</collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="ipappprotocol">
-<unit bldFile="/sf/mw/ipappprotocols/group" mrp=""/>
-</component>
-</collection>
-</block>
+    <collection name="rtp" long-name="RTP" level="server">
+     <component name="srtpstack" filter="s60" long-name="SRTP Stack">
+      <unit bldFile="/sf/mw/ipappprotocols/rtp/srtpstack/group"/>
+     </component>
+     <component name="rtpstack" filter="s60" long-name="RTP Stack">
+      <unit bldFile="/sf/mw/ipappprotocols/rtp/rtpstack/group"/>
+     </component>
+    </collection>
+    <collection name="realtimenetprots" long-name="Real Time Net Protocols" level="server">
+     <component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
+      <!-- Real Time Data Protocol -->
+      <unit bldFile="/sf/mw/ipappprotocols/realtimenetprots/rtp/group" mrp="/sf/mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
+     </component>
+     <component name="sipfw" long-name="SIP Framework" introduced="9.2" purpose="optional">
+      <unit bldFile="/sf/mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="/sf/mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
+     </component>
+    </collection>
+    <collection name="sipplugins" long-name="SIP Plugins" level="plugin">
+     <component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
+      <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
+     </component>
+     <component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
+      <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
+     </component>
+     <component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
+      <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
+     </component>
+     <component name="sippsystemstatemonitor" filter="s60" long-name="SIP System State Monitor" plugin="Y">
+      <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
+     </component>
+     <component name="sippsipadapter" filter="s60" long-name="SIP Adapter" introduced="^3" plugin="Y">
+      <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
+     </component>
+    </collection>
+    <collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
+     <component name="sipprovider" long-name="SIP Provider" introduced="^2" purpose="optional" plugin="Y">
+      <unit bldFile="/sf/mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="/sf/mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
+     </component>
+    </collection>
+    <collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
+     <component name="ipappprotocols_plat" filter="s60" long-name="IP App Protocols Platform Interfaces" class="api">
+      <unit bldFile="/sf/mw/ipappprotocols/ipappprotocols_plat/group"/>
+     </component>
+     <component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
+      <unit mrp="/sf/mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file