--- a/symbian3/mw/ipappsrv/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/ipappsrv/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,49 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="ipappsrv" name="IP App Services" levels="framework generic server conn plugin">
-    <collection id="natfw" name="NAT Framework" level="framework">
-    	<!-- collection is really a component. Need to move down a directory -->
-      <component id="natfw_build" filter="s60" name="NAT Framework Build" introduced="^2">
-        <unit bldFile="natfw/group"/>
-      </component>
-    </collection>
-    <collection id="multimediacommscontroller" name="Multimedia Comms Controller" level="conn">
-    	<!-- collection is really a component. Need to move down a directory -->
-      <component id="multimediacommscontroller_build" filter="s60" name="Multimedia Comms Controller Build">
-        <unit bldFile="multimediacommscontroller/group"/>
-      </component>
-    </collection>
-    <collection id="multimediacommsengine" name="Multimedia Comms Engine" level="generic">
-    	<!-- collection is really a component. Need to move down a directory -->
-      <component id="multimediacommsengine_build" filter="s60" name="Multimedia Comms Engine Build">
-        <unit bldFile="multimediacommsengine/group"/>
-      </component>
-    </collection>
-    <collection id="natplugins" name="NAT Plugins" level="plugin">
-      <component id="natpcliprovisioningnatfwadapter" filter="s60" name="Client Provisioning NAT Framework Traversal Adapter" class="plugin" introduced="^2">
-        <unit bldFile="natplugins/natpcliprovisioningnatfwadapter/group"/>
-      </component>
-      <component id="natpdevmgmtnatfwadapter" filter="s60" name="Device Management NAT Framework Traversal Adapter" class="plugin">
-        <unit bldFile="natplugins/natpdevmgmtnatfwadapter/group"/>
-      </component>
-      <component id="natptraversalcontroller" filter="s60" name="NAT Traversal Controller" class="plugin">
-        <unit bldFile="natplugins/natptraversalcontroller/group"/>
-      </component>
-      <component id="natpnatfwsdpprovider" filter="s60" name="NAT Framework SDP Provider" class="plugin">
-        <unit bldFile="natplugins/natpnatfwsdpprovider/group"/>
-      </component>
-    </collection>
-    <collection id="ipappsrv_info" name="IP App Services Info" level="plugin">
-      <component id="ipappsrv_plat" filter="s60" name="IP App Services Platform Interfaces" class="api">
-        <unit bldFile="ipappsrv_plat/group"/>
-      </component>
-      <component id="ipappsrv_build" name="IP App Services Build" filter="s60">
-      	<!-- remove the #includes from here and rename as xxx ROM or move iby/sis files into another component-->
-        <unit mrp="group"/>
-      </component>
-      <component id="ipappsrv_metadata" name="IP App Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
+ <package id="ipappsrv" name="IP App Services" levels="framework generic server conn plugin">
+  <collection id="ipappsrv_plat" name="IP App Services Platform Interfaces" level="plugin">
+   <component id="transcoder_api" name="Transcoder API" class="api" filter="s60">
+    <meta rel="Api" href="ipappsrv_plat/transcoder_api/transcoder_api.metaxml"/>
+    <unit bldFile="ipappsrv_plat/transcoder_api/group"/>
+   </component>
+   <component id="comms_event_api" name="Comms Event API" class="api" filter="s60">
+    <meta rel="Api" href="ipappsrv_plat/comms_event_api/comms_event_api.metaxml"/>
+    <unit bldFile="ipappsrv_plat/comms_event_api/group"/>
+   </component>
+   <component id="floor_control_api" name="Floor Control API" class="api" filter="s60">
+    <meta rel="Api" href="ipappsrv_plat/floor_control_api/floor_control_api.metaxml"/>
+    <unit bldFile="ipappsrv_plat/floor_control_api/group"/>
+   </component>
+   <component id="media_control_api" name="Media Control API" class="api" filter="s60">
+    <meta rel="Api" href="ipappsrv_plat/media_control_api/media_control_api.metaxml"/>
+    <unit bldFile="ipappsrv_plat/media_control_api/group"/>
+   </component>
+   <component id="multimedia_comms_api" name="Multimedia Comms API" class="api" filter="s60">
+    <meta rel="Api" href="ipappsrv_plat/multimedia_comms_api/multimedia_comms_api.metaxml"/>
+    <unit bldFile="ipappsrv_plat/multimedia_comms_api/group"/>
+   </component>
+   <component id="nat_settings_api" name="NAT Settings API" class="api" filter="s60">
+    <meta rel="Api" href="ipappsrv_plat/nat_settings_api/nat_settings_api.metaxml"/>
+    <unit bldFile="ipappsrv_plat/nat_settings_api/group"/>
+   </component>
+  </collection>
+  <collection id="natfw" name="NAT Framework" level="framework">
+   <!-- collection is really a component. Need to move down a directory -->
+   <component id="natfw_build" filter="s60" name="NAT Framework Build" introduced="^2">
+    <unit bldFile="natfw/group"/>
+   </component>
+  </collection>
+  <collection id="multimediacommscontroller" name="Multimedia Comms Controller" level="conn">
+   <!-- collection is really a component. Need to move down a directory -->
+   <component id="multimediacommscontroller_build" filter="s60" name="Multimedia Comms Controller Build">
+    <unit bldFile="multimediacommscontroller/group"/>
+   </component>
+  </collection>
+  <collection id="multimediacommsengine" name="Multimedia Comms Engine" level="generic">
+   <!-- collection is really a component. Need to move down a directory -->
+   <component id="multimediacommsengine_build" filter="s60" name="Multimedia Comms Engine Build">
+    <unit bldFile="multimediacommsengine/group"/>
+   </component>
+  </collection>
+  <collection id="natplugins" name="NAT Plugins" level="plugin">
+   <component id="natpcliprovisioningnatfwadapter" filter="s60" name="Client Provisioning NAT Framework Traversal Adapter" class="plugin" introduced="^2">
+    <unit bldFile="natplugins/natpcliprovisioningnatfwadapter/group"/>
+   </component>
+   <component id="natpdevmgmtnatfwadapter" filter="s60" name="Device Management NAT Framework Traversal Adapter" class="plugin">
+    <unit bldFile="natplugins/natpdevmgmtnatfwadapter/group"/>
+   </component>
+   <component id="natptraversalcontroller" filter="s60" name="NAT Traversal Controller" class="plugin">
+    <unit bldFile="natplugins/natptraversalcontroller/group"/>
+   </component>
+   <component id="natpnatfwsdpprovider" filter="s60" name="NAT Framework SDP Provider" class="plugin">
+    <unit bldFile="natplugins/natpnatfwsdpprovider/group"/>
+   </component>
+  </collection>
+  <collection id="ipappsrv_info" name="IP App Services Info" level="plugin">
+   <component id="ipappsrv_build" name="IP App Services Build" filter="s60">
+    <!-- remove the #includes from here and rename as xxx ROM or move iby/sis files into another component-->
+    <unit mrp="group"/>
+   </component>
+   <component id="ipappsrv_metadata" name="IP App Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>