# HG changeset patch
# User Sampo Huttunen <sampo.huttunen@nokia.com>
# Date 1290088017 -7200
# Node ID 97caed2372caf77e7fce97f813bce904cab554ff
# Parent  9b689d9d3a1c4cc79180aa61c624acb4dd9f02e9
Fixed AVController, it was accidentally set to search only for renderers. Now also servers are added to device list. Also some minor changes in package definition xml and platform API xml definition files.

diff -r 9b689d9d3a1c -r 97caed2372ca dlnasrv_plat/upnp_av_objects_api/upnp_av_objects_api.metaxml
--- a/dlnasrv_plat/upnp_av_objects_api/upnp_av_objects_api.metaxml	Fri Nov 05 18:31:17 2010 +0200
+++ b/dlnasrv_plat/upnp_av_objects_api/upnp_av_objects_api.metaxml	Thu Nov 18 15:46:57 2010 +0200
@@ -1,17 +1,17 @@
 <?xml version="1.0" ?>
-<api id="0a0d900cb82f4c2eb37477cf77133cac" dataversion="1.0">
+<api id="0a0d900cb82f4c2eb37477cf77133cac" dataversion="2.0">
   <name>UPnP AV Objects API</name>
   <description>This API is used to create UPnP AV objects</description>
   <type>c++</type>
-  <subsystem>upnpmediaserver</subsystem>
+  <collection>upnpmediaserver</collection>
   <libs>
     <lib name="upnpavobjects.lib" />
   </libs>
-  <release category="domain"/>
+  <release category="platform"/>
   <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
+     <!-- This indicates whether the api provides separate html documentation -->
      <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
+     <!-- If you are unsure then the value is "no" -->
      <htmldocprovided>no</htmldocprovided>
      <adaptation>no</adaptation>
   </attributes>
diff -r 9b689d9d3a1c -r 97caed2372ca dlnasrv_plat/upnp_command_api/upnp_command_api.metaxml
--- a/dlnasrv_plat/upnp_command_api/upnp_command_api.metaxml	Fri Nov 05 18:31:17 2010 +0200
+++ b/dlnasrv_plat/upnp_command_api/upnp_command_api.metaxml	Thu Nov 18 15:46:57 2010 +0200
@@ -1,17 +1,17 @@
 <?xml version="1.0" ?>
-<api id="71017ac67649c84e150cbfc46b1bf6f1" dataversion="1.0">
+<api id="71017ac67649c84e150cbfc46b1bf6f1" dataversion="2.0">
   <name>UPnP Command API</name>
   <description>API for UPnP commands</description>
   <type>c++</type>
-  <subsystem>upnpframework</subsystem>
+  <collection>upnpframework</collection>
   <libs>
     <lib name="upnpcommand.lib" />
   </libs>
-  <release category="domain"/>
+  <release category="platform"/>
   <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
+     <!-- This indicates whether the api provides separate html documentation -->
      <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
+     <!-- If you are unsure then the value is "no" -->
      <htmldocprovided>no</htmldocprovided>
      <adaptation>no</adaptation>
   </attributes>
diff -r 9b689d9d3a1c -r 97caed2372ca dlnasrv_plat/upnp_media_server_api/upnp_media_server_api.metaxml
--- a/dlnasrv_plat/upnp_media_server_api/upnp_media_server_api.metaxml	Fri Nov 05 18:31:17 2010 +0200
+++ b/dlnasrv_plat/upnp_media_server_api/upnp_media_server_api.metaxml	Thu Nov 18 15:46:57 2010 +0200
@@ -1,17 +1,17 @@
 <?xml version="1.0" ?>
-<api id="c151325b6098d0d1e3295dbaeea0836b" dataversion="1.0">
+<api id="c151325b6098d0d1e3295dbaeea0836b" dataversion="2.0">
   <name>UPnP Media Server API</name>
   <description>The API to start and stop UPnP Media Server.</description>
   <type>c++</type>
-  <subsystem>upnpmediaserver</subsystem>
+  <collection>upnpmediaserver</collection>
   <libs>
     <lib name="avmediaserverclient.lib" />
   </libs>
-  <release category="domain"/>
+  <release category="platform"/>
   <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
+     <!-- This indicates whether the api provides separate html documentation -->
      <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
+     <!-- If you are unsure then the value is "no" -->
      <htmldocprovided>no</htmldocprovided>
      <adaptation>no</adaptation>
   </attributes>
diff -r 9b689d9d3a1c -r 97caed2372ca dlnasrv_plat/upnp_media_server_metadata_api/upnp_media_server_metadata_api.metaxml
--- a/dlnasrv_plat/upnp_media_server_metadata_api/upnp_media_server_metadata_api.metaxml	Fri Nov 05 18:31:17 2010 +0200
+++ b/dlnasrv_plat/upnp_media_server_metadata_api/upnp_media_server_metadata_api.metaxml	Thu Nov 18 15:46:57 2010 +0200
@@ -1,17 +1,17 @@
 <?xml version="1.0" ?>
-<api id="5b2da54cb04654dadce172d8f15171b3" dataversion="1.0">
+<api id="5b2da54cb04654dadce172d8f15171b3" dataversion="2.0">
   <name>UPnP Media Server Metadata API</name>
   <description>The API to create, delete and read metadata in order to share, unshare and browse local media server content.</description>
   <type>c++</type>
-  <subsystem>upnpmediaserver</subsystem>
+  <collection>upnpmediaserver</collection>
   <libs>
     <lib name="avmediaserverclient.lib" />
   </libs>
-  <release category="domain"/>
+  <release category="platform"/>
   <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
+     <!-- This indicates whether the api provides separate html documentation -->
      <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
+     <!-- If you are unsure then the value is "no" -->
      <htmldocprovided>no</htmldocprovided>
      <adaptation>no</adaptation>
   </attributes>
diff -r 9b689d9d3a1c -r 97caed2372ca dlnasrv_plat/upnp_media_server_settings_api/upnp_media_server_settings_api.metaxml
--- a/dlnasrv_plat/upnp_media_server_settings_api/upnp_media_server_settings_api.metaxml	Fri Nov 05 18:31:17 2010 +0200
+++ b/dlnasrv_plat/upnp_media_server_settings_api/upnp_media_server_settings_api.metaxml	Thu Nov 18 15:46:57 2010 +0200
@@ -1,17 +1,17 @@
 <?xml version="1.0" ?>
-<api id="8b21ead1e12a955ec0a81da1fe3b392e" dataversion="1.0">
+<api id="8b21ead1e12a955ec0a81da1fe3b392e" dataversion="2.0">
   <name>UPnP Media Server Settings API</name>
   <description>The setting and configuration API for controlling the settings of UPnP Media Server.</description>
   <type>c++</type>
-  <subsystem>upnpmediaserver</subsystem>
+  <collection>upnpmediaserver</collection>
   <libs>
     <lib name="avmediaserverclient.lib" />
   </libs>
-  <release category="domain"/>
+  <release category="platform"/>
   <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
+     <!-- This indicates whether the api provides separate html documentation -->
      <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
+     <!-- If you are unsure then the value is "no" -->
      <htmldocprovided>no</htmldocprovided>
      <adaptation>no</adaptation>
   </attributes>
diff -r 9b689d9d3a1c -r 97caed2372ca dlnasrv_plat/upnp_plugin_api/upnp_plugin_api.metaxml
--- a/dlnasrv_plat/upnp_plugin_api/upnp_plugin_api.metaxml	Fri Nov 05 18:31:17 2010 +0200
+++ b/dlnasrv_plat/upnp_plugin_api/upnp_plugin_api.metaxml	Thu Nov 18 15:46:57 2010 +0200
@@ -1,16 +1,16 @@
 <?xml version="1.0" ?>
-<api id="7962190d3ac281ae325f7277989fae08" dataversion="1.0">
+<api id="7962190d3ac281ae325f7277989fae08" dataversion="2.0">
   <name>UPnP Plugin API</name>
   <description>UPnP Home Media Application extension plugin API</description>
   <type>c++</type>
-  <subsystem>upnpframework</subsystem>
+  <collection>upnpframework</collection>
   <libs>
   </libs>
-  <release category="domain"/>
+  <release category="platform"/>
   <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
+     <!-- This indicates whether the api provides separate html documentation -->
      <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
+     <!-- If you are unsure then the value is "no" -->
      <htmldocprovided>no</htmldocprovided>
      <adaptation>no</adaptation>
   </attributes>
diff -r 9b689d9d3a1c -r 97caed2372ca dlnasrv_plat/upnp_security_plugin_api/upnp_security_plugin_api.metaxml
--- a/dlnasrv_plat/upnp_security_plugin_api/upnp_security_plugin_api.metaxml	Fri Nov 05 18:31:17 2010 +0200
+++ b/dlnasrv_plat/upnp_security_plugin_api/upnp_security_plugin_api.metaxml	Thu Nov 18 15:46:57 2010 +0200
@@ -1,17 +1,17 @@
 <?xml version="1.0" ?>
-<api id="e72947e11e52e716289e304a19afda75" dataversion="1.0">
+<api id="e72947e11e52e716289e304a19afda75" dataversion="2.0">
   <name>UPnP Security Plugin API</name>
   <description>Defines the logical interface implemented by a security plug-in component authorizing service requests.</description>
   <type>c++</type>
-  <subsystem>upnpstack</subsystem>
+  <collection>upnpstack</collection>
   <libs>
     <lib name="upnpserviceframework.lib" />
   </libs>
-  <release category="domain"/>
+  <release category="platform"/>
   <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
+     <!-- This indicates whether the api provides separate html documentation -->
      <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
+     <!-- If you are unsure then the value is "no" -->
      <htmldocprovided>no</htmldocprovided>
      <adaptation>no</adaptation>
   </attributes>
diff -r 9b689d9d3a1c -r 97caed2372ca install/dlnasrv.sis
Binary file install/dlnasrv.sis has changed
diff -r 9b689d9d3a1c -r 97caed2372ca package_definition.xml
--- a/package_definition.xml	Fri Nov 05 18:31:17 2010 +0200
+++ b/package_definition.xml	Thu Nov 18 15:46:57 2010 +0200
@@ -57,7 +57,10 @@
    </component>
   </collection>
   <collection id="upnpframework" name="UPnP Framework" level="framework">
-   <unit bldFile="upnpframework/group"/>
+   <!-- collection level group's export done via a fake component -->
+   <component id="upnpframework_collection" filter="s60" name="UPnP Framework" introduced="^2">
+     <unit bldFile="upnpframework/group"/>
+   </component>
    <component id="upnpcommand" filter="s60" name="UPnP Command" introduced="^2">
     <unit bldFile="upnpframework/upnpcommand/group"/>
    </component>
@@ -75,6 +78,10 @@
    </component>
   </collection>   
   <collection id="upnpmediaserver" name="UPnP Media Server" level="server">
+   <!-- collection level group's export done via a fake component --> 
+   <component id="upnpmediaserver_collection" filter="s60" name="UPnP Media Server" introduced="^2">
+    <unit bldFile="upnpmediaserver/group"/>
+   </component>
    <component id="avobjects" filter="s60" name="A/V Objects">
     <unit bldFile="upnpmediaserver/avobjects/group" filter="!test"/>
     <unit bldFile="upnpmediaserver/avobjects/tsrc/public/basic/group" filter="test,api_test"/>
@@ -94,11 +101,19 @@
    </component>
   </collection>  
   <collection id="upnpsettings" name="UPnP Settings" level="framework">
+   <!-- collection level group's export done via a fake component -->
+   <component id="upnpsettings_collection" filter="s60" name="UPnP Settings" introduced="^2">
+    <unit bldFile="upnpsettings/group"/>
+   </component>
    <component id="upnpsettingsengine" filter="s60" name="UPnP Settings Engine" introduced="^2">
     <unit bldFile="upnpsettings/upnpsettingsengine/group"/>
    </component>
   </collection>
   <collection id="upnpsharing" name="UPnP Sharing" level="server">
+   <!-- collection level group's export done via a fake component --> 
+   <component id="upnpsharing_collection" filter="s60" name="UPnP Sharing" introduced="^2">
+    <unit bldFile="upnpsharing/group"/>
+   </component>
    <component id="upnpcontentserver" filter="s60" name="UPnP Content Server" introduced="^2">
     <unit bldFile="upnpsharing/upnpcontentserver/group"/>
    </component>    
diff -r 9b689d9d3a1c -r 97caed2372ca upnpavcontroller/upnpavcontrollerserver/src/upnpavcontrolpoint.cpp
--- a/upnpavcontroller/upnpavcontrollerserver/src/upnpavcontrolpoint.cpp	Fri Nov 05 18:31:17 2010 +0200
+++ b/upnpavcontroller/upnpavcontrollerserver/src/upnpavcontrolpoint.cpp	Thu Nov 18 15:46:57 2010 +0200
@@ -139,13 +139,12 @@
 //
 void CUpnpAVControlPoint::StartUpL()
     {
-    //_LIT8( KMediaServer, "urn:schemas-upnp-org:device:MediaServer" );
+    _LIT8( KMediaServer, "urn:schemas-upnp-org:device:MediaServer" );
     _LIT8( KMediaRenderer, "urn:schemas-upnp-org:device:MediaRenderer" );
 
     CDesC8ArrayFlat* targetDeviceTypes = new(ELeave) CDesC8ArrayFlat(1);
     CleanupStack::PushL( targetDeviceTypes );
-    // We only have push use case, no need to ask stack to find media servers: 
-    //targetDeviceTypes->AppendL( KMediaServer() );
+    targetDeviceTypes->AppendL( KMediaServer() );
     targetDeviceTypes->AppendL( KMediaRenderer() );    
     CUpnpControlPoint::ConstructL( *targetDeviceTypes );
     CleanupStack::Pop( targetDeviceTypes );