diff -r 3785f754ee62 -r 5360b7ddc251 package_definition.xml
--- a/package_definition.xml	Fri Sep 17 08:31:21 2010 +0300
+++ b/package_definition.xml	Mon Nov 01 12:37:49 2010 +0200
@@ -19,10 +19,6 @@
     <meta rel="Api" href="dlnasrv_plat/upnp_security_plugin_api/upnp_security_plugin_api.metaxml"/>
     <unit bldFile="dlnasrv_plat/upnp_security_plugin_api/group"/>
    </component>
-   <component id="upnp_avcp_api" name="UPnP AVCP API" class="api" filter="s60">
-    <meta rel="Api" href="dlnasrv_plat/upnp_avcp_api/upnp_avcp_api.metaxml"/>
-    <unit bldFile="dlnasrv_plat/upnp_avcp_api/group"/>
-   </component>
    <component id="upnp_media_server_metadata_api" name="UPnP Media Server Metadata API" class="api" filter="s60">
     <meta rel="Api" href="dlnasrv_plat/upnp_media_server_metadata_api/upnp_media_server_metadata_api.metaxml"/>
     <unit bldFile="dlnasrv_plat/upnp_media_server_metadata_api/group"/>
@@ -39,15 +35,6 @@
     <unit bldFile="dlnasrv_plat/upnp_plugin_api/tsrc/upnpextensionpluginiftest/group" filter="test,api_test"/>
    </component>
   </collection>
-  <collection id="upnpavcontrolpoint" name="UPnP A/V Control Point" level="plugin">
-   <component id="avcontrolframework" filter="s60" name="A/V Control Famework" introduced="9.1" deprecated="^3">
-    <unit bldFile="upnpavcontrolpoint/avcontrolframework/group" filter="!test"/>
-    <unit bldFile="upnpavcontrolpoint/avcontrolframework/tsrc/public/basic/group" filter="test,api_test"/>
-   </component>
-   <component id="upnpavcontrolpoint_rom" filter="s60" name="UPnP A/V Control Point ROM" introduced="9.1" deprecated="^3">
-    <unit bldFile="upnpavcontrolpoint/rom"/>
-   </component>
-  </collection>
   <collection id="upnpmediaserver" name="UPnP Media Server" level="server">
    <component id="avobjects" filter="s60" name="A/V Objects">
     <unit bldFile="upnpmediaserver/avobjects/group" filter="!test"/>
@@ -66,9 +53,6 @@
    <component id="mediaserverengine" filter="s60" name="Media Server Engine">
     <unit bldFile="upnpmediaserver/mediaserverengine/group"/>
    </component>
-   <component id="upnpmediaserver_rom" filter="s60" name="UPnP Media Server ROM">
-    <unit bldFile="upnpmediaserver/rom"/>
-   </component>
   </collection>
   <collection id="upnpavcontroller" name="UPnP A/V Controller" level="ctrl">
    <component id="upnpxmlparser" filter="s60" name="UPnP XML Parser" introduced="^2">
@@ -84,85 +68,31 @@
    <component id="upnpavcontrollerhelper" filter="s60" name="UPnP A/V Controller Helper" introduced="^2">
     <unit bldFile="upnpavcontroller/upnpavcontrollerhelper/group"/>
    </component>
-   <component id="upnpavcontroller_rom" filter="s60" name="UPnP A/V Controller ROM" introduced="^2">
-    <unit bldFile="upnpavcontroller/rom"/>
+   <component id="upnprenderingstatemachine" filter="s60" name="UPnP Rendering State Machine" introduced="^3">
+    <unit bldFile="upnpavcontroller/upnprenderingstatemachine/group"/>
    </component>
   </collection>
   <collection id="upnpframework" name="UPnP Framework" level="framework">
    <component id="upnputilities" filter="s60" name="UPnP Utilities" introduced="^2">
     <unit bldFile="upnpframework/upnputilities/group"/>
    </component>
-   <component id="upnpextensionpluginif" filter="s60" name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-    <meta rel="config">
-     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-    </meta>
-    <unit bldFile="upnpframework/upnpextensionpluginif/group"/>
-   </component>
    <component id="upnpfiletransferengine" filter="s60" name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
     <meta rel="config">
      <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
     </meta>
     <unit bldFile="upnpframework/upnpfiletransferengine/group"/>
    </component>
-   <component id="upnpcommonui" filter="s60" name="UPnP Common UI" introduced="^2" deprecated="^3">
-    <meta rel="config">
-     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-    </meta>
-    <unit bldFile="upnpframework/upnpcommonui/group"/>
-   </component>
-   <component id="upnpaiwengine" filter="s60" name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-    <meta rel="config">
-     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-    </meta>
-    <unit bldFile="upnpframework/upnpaiwengine/group"/>
-   </component>
-   <component id="upnpaiwprovider" filter="s60" name="UPnP AIW Provider" class="plugin" introduced="^2" deprecated="^3">
-    <meta rel="config">
-     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-    </meta>
-    <unit bldFile="upnpframework/upnpaiwprovider/group"/>
-   </component>
    <component id="upnpmusicadapter" filter="s60" name="UPnP Music Adapter" introduced="^2">
     <unit bldFile="upnpframework/upnpmusicadapter/group"/>
    </component>
    <component id="upnpcommand" filter="s60" name="UPnP Command" introduced="^2">
     <unit bldFile="upnpframework/upnpcommand/group"/>
    </component>
-   <component id="upnpframework_rom" filter="s60" name="UPnP Framework ROM" introduced="^2">
-    <unit bldFile="upnpframework/rom"/>
-   </component>
   </collection>
   <collection id="upnpsettings" name="UPnP Settings" level="framework">
    <component id="upnpsettingsengine" filter="s60" name="UPnP Settings Engine" introduced="^2">
     <unit bldFile="upnpsettings/upnpsettingsengine/group"/>
    </component>
-   <component id="multiselectionui" filter="s60" name="Multi-Selection UI" introduced="^2" deprecated="^3">
-    <meta rel="config">
-     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-    </meta>
-    <unit bldFile="upnpsettings/multiselectionui/group"/>
-   </component>
-   <component id="appwizard" filter="s60" name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-    <meta rel="config">
-     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-    </meta>
-    <unit bldFile="upnpsettings/appwizard/group"/>
-   </component>
-   <component id="upnpsharingui" filter="s60" name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-    <meta rel="config">
-     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-    </meta>
-    <unit bldFile="upnpsettings/upnpsharingui/group"/>
-   </component>
-   <component id="upnpgsplugin" filter="s60" name="UPnP GS Plugin" class="plugin" introduced="^2">
-    <meta rel="config">
-     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-    </meta>
-    <unit bldFile="upnpsettings/upnpgsplugin/group"/>
-   </component>
-   <component id="upnpsettings_rom" filter="s60" name="UPnP Settings ROM" introduced="^2">
-    <unit bldFile="upnpsettings/rom"/>
-   </component>
   </collection>
   <!-- this collection was deleted a while back, but the tests are still #included from elsewhere. 
 	If they're coming back, uncomment out this part, otherwise just delete this whole collection 
@@ -188,57 +118,8 @@
    <component id="upnpcontentserver" filter="s60" name="UPnP Content Server" introduced="^2">
     <unit bldFile="upnpsharing/upnpcontentserver/group"/>
    </component>
-   <component id="applicationengine" filter="s60" name="UPnP Application Engine" introduced="^2">
-    <unit bldFile="upnpsharing/applicationengine/group"/>
-   </component>
-   <component id="upnpsharing_rom" filter="s60" name="UPnP Sharing ROM" introduced="^2">
-    <unit bldFile="upnpsharing/rom"/>
-   </component>
-  </collection>
-  <collection id="upnpmpxplugins" name="UPnP MPX Plugins" level="plugin">
-   <component id="upnpplaybackplugins" filter="s60" name="UPnP Playback Plugins" class="plugin" introduced="^2">
-    <unit bldFile="upnpmpxplugins/upnpplaybackplugins/group"/>
-   </component>
-   <component id="upnpmpxplugins_rom" filter="s60" name="UPnP MPX Plugins ROM" introduced="^2">
-    <unit bldFile="upnpmpxplugins/rom"/>
-   </component>
-  </collection>
-  <collection id="upnpharvester" name="UPnP Harvester" level="ctrl">
-   <meta rel="config">
-    <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-   </meta>
-   <component id="upnpharvester_common" filter="s60" name="UPnP Harvester Common" introduced="^2" deprecated="^3">
-    <!-- need to merge or #include these to a single bld.inf -->
-    <unit bldFile="upnpharvester/common/cmlibrary/group"/>
-        <unit bldFile="upnpharvester/common/cmsettings/group"/>
-        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
-        <unit bldFile="upnpharvester/common/dbmanager/group"/>
-   </component>
-   <component id="cdssync" filter="s60" name="CDS Sync" introduced="^2" deprecated="^3">
-    <unit bldFile="upnpharvester/cdssync/common"/>
-   </component>
-   <component id="mdhserver" filter="s60" name="Metadata Harvester Server" introduced="^2" deprecated="^3">
-    <unit bldFile="upnpharvester/mdhserver/group"/>
-   </component>
-   <component id="upnpharvester_rom" filter="s60" name="UPnP Harvester ROM" introduced="^2" deprecated="^3">
-    <unit bldFile="upnpharvester/rom"/>
-   </component>
-  </collection>
-  <collection id="homesync" name="Home Sync" level="plugin">
-   <meta rel="config">
-    <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-   </meta>
-   <component id="contentmanager" filter="s60" name="Content Manager" introduced="^2" deprecated="^3">
-        <unit bldFile="homesync/group"/> <!-- move bld.inf into contentmanager dir -->
-   </component>
-  </collection>
-  <collection id="homemedia" name="Home Media" level="framework">
-   <meta rel="config">
-    <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-   </meta>
-   <!-- collection is really just a component. Move down a directory -->
-   <component id="homemedia_build" filter="s60" name="Home Media" introduced="^2" deprecated="^3">
-     <unit bldFile="homemedia/group"/> 
+   <component id="upnpsharingalgorithm" filter="s60" name="UPnP Sharing Algorithm" introduced="^3">
+    <unit bldFile="upnpsharing/upnpsharingalgorithm/group"/>
    </component>
   </collection>
  </package>