--- a/symbian3/mw/ipappprotocols/package_definition.xml	Wed Dec 02 18:06:06 2009 +0000
+++ b/symbian3/mw/ipappprotocols/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
@@ -1,64 +1,128 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
+<!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="ipappprotocols" long-name="IP App Protocols" tech_domain="dc" level="generic" levels="plugin framework conn server">
-    <collection name="rtp" long-name="RTP" level="server">
-     <component name="srtpstack" long-name="SRTP Stack" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappprotocols/rtp/srtpstack/group"/>
-      <!-- <unit bldFile="/sf/mw/ipappprotocols/rtp/srtpstack/tsrc/ut_srtpstack/group"/> -->
-     </component>
-     <component name="rtpstack" long-name="RTP Stack" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappprotocols/rtp/rtpstack/group"/>
-      <!-- <unit bldFile="/sf/mw/ipappprotocols/rtp/rtpstack/tsrc/ut_rtpstack/group"/> -->
-     </component>
-    </collection>
-    <collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-     <component name="sippwlanplugin" long-name="SIP WLAN Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-     </component>
-     <component name="sippsipsettingsui" long-name="SIP Settings UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-      <!-- <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippsipsettingsui/tsrc/ut_sipsettingsui/group"/> -->
-     </component>
-     <component name="sippdevmgmtsipadapter" long-name="Device Management SIP Adapter" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-      <!-- <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/tsrc/ut_cnsmldmsipadapter/group"/> -->
-     </component>
-     <component name="sippsystemstatemonitor" long-name="SIP System State Monitor" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-     </component>
-     <component name="sippsipadapter" long-name="SIP Adapter" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-      <!-- <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippsipadapter/tsrc/ut_cwpsipadapter/group"/> -->
-     </component>
-    </collection>
-    <collection name="realtimenetprots" long-name="Real-time Internet Protocols" level="server">
-     <component name="rtp" long-name="RTP" introduced="9.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- 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" filter="gt" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <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" filter="gt" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <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="server">
-     <component unofficial="yes" name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappprotocols/ipappprotocols_plat/group"/>
-     </component>
-     <component unofficial="yes" name="ipappprotocols_build" long-name="IP App Protocols Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappprotocols/group"/>
-     </component>
-    <component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
+<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>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file