# HG changeset patch
# User Sampo Huttunen <sampo.huttunen@nokia.com>
# Date 1288974677 -7200
# Node ID 9b689d9d3a1c4cc79180aa61c624acb4dd9f02e9
# Parent  b4d83ea1d6e2beeb6977a8c1719bbdf2d9a4ddb1
Added signed SIS. Also updated package definition file and did some capitalization corrections to few mmp files.

diff -r b4d83ea1d6e2 -r 9b689d9d3a1c dlnasrv_exampleapp/src/exampleappui.cpp
--- a/dlnasrv_exampleapp/src/exampleappui.cpp	Wed Nov 03 12:18:00 2010 +0200
+++ b/dlnasrv_exampleapp/src/exampleappui.cpp	Fri Nov 05 18:31:17 2010 +0200
@@ -375,9 +375,9 @@
         
         // update text to ui
         QFileInfo fileInfo(mSelectedFile);
-        // use only 20 characters to fit text on screen 
+        // use only 16 characters to fit text on screen 
         // since otherwise qt will panic with bad alloc
-        mSelectedFileLabel->setText(fileInfo.fileName().left(20));
+        mSelectedFileLabel->setText(fileInfo.fileName().left(16));
        
         // resolve and init file for rendering
         int err = mEngine->initFile(mSelectedFile);
diff -r b4d83ea1d6e2 -r 9b689d9d3a1c install/dlnasrv.sis
Binary file install/dlnasrv.sis has changed
diff -r b4d83ea1d6e2 -r 9b689d9d3a1c package_definition.xml
--- a/package_definition.xml	Wed Nov 03 12:18:00 2010 +0200
+++ b/package_definition.xml	Fri Nov 05 18:31:17 2010 +0200
@@ -1,31 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
+<SystemDefinition schema="3.0.1" xmlns:qt="http://www.nokia.com/qt">
  <package id="dlnasrv" name="DLNA Services" levels="stack server ctrl framework plugin">
-  <!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
+
+  <collection id="dlnasrv_exampleapp" name="DLNA Services Test Application" level="framework">
+   <unit bldFile="dlnasrv_exampleapp" qt:proFile="dlnasrv_exampleapp.pro"/>
+  </collection>  
   <collection id="dlnasrv_plat" name="DLNA Services Platform Interfaces" level="plugin">
-   <component id="upnp_media_server_settings_api" name="UPnP Media Server Settings API" class="api" filter="s60">
-    <meta rel="Api" href="dlnasrv_plat/upnp_media_server_settings_api/upnp_media_server_settings_api.metaxml"/>
-    <unit bldFile="dlnasrv_plat/upnp_media_server_settings_api/group"/>
-   </component>
    <component id="upnp_av_objects_api" name="UPnP A/V Objects API" class="api" filter="s60">
     <meta rel="Api" href="dlnasrv_plat/upnp_av_objects_api/upnp_av_objects_api.metaxml"/>
     <unit bldFile="dlnasrv_plat/upnp_av_objects_api/group"/>
    </component>
+   <component id="upnp_command_api" name="UPnP Command API" class="api" filter="s60">
+    <meta rel="Api" href="dlnasrv_plat/upnp_command_api/upnp_command_api.metaxml"/>
+    <unit bldFile="dlnasrv_plat/upnp_command_api/group"/>
+   </component>
    <component id="upnp_media_server_api" name="UPnP Media Server API" class="api" filter="s60">
     <meta rel="Api" href="dlnasrv_plat/upnp_media_server_api/upnp_media_server_api.metaxml"/>
     <unit bldFile="dlnasrv_plat/upnp_media_server_api/group"/>
    </component>
-   <component id="upnp_security_plugin_api" name="UPnP Security Plugin API" class="api" filter="s60">
-    <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_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"/>
-   </component>
-   <component id="upnp_command_api" name="UPnP Command API" class="api" filter="s60">
-    <meta rel="Api" href="dlnasrv_plat/upnp_command_api/upnp_command_api.metaxml"/>
-    <unit bldFile="dlnasrv_plat/upnp_command_api/group"/>
+   </component>         
+   <component id="upnp_media_server_settings_api" name="UPnP Media Server Settings API" class="api" filter="s60">
+    <meta rel="Api" href="dlnasrv_plat/upnp_media_server_settings_api/upnp_media_server_settings_api.metaxml"/>
+    <unit bldFile="dlnasrv_plat/upnp_media_server_settings_api/group"/>
    </component>
    <component id="upnp_plugin_api" name="UPnP Plugin API" class="api" filter="s60">
     <meta rel="Api" href="dlnasrv_plat/upnp_plugin_api/upnp_plugin_api.metaxml"/>
@@ -34,90 +33,84 @@
     <unit bldFile="dlnasrv_plat/upnp_plugin_api/tsrc/testplugin/group" filter="test,api_test"/>
     <unit bldFile="dlnasrv_plat/upnp_plugin_api/tsrc/upnpextensionpluginiftest/group" filter="test,api_test"/>
    </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"/>
-    <unit bldFile="upnpmediaserver/avobjects/tsrc/public/basic/group" filter="test,api_test"/>
-   </component>
-   <component id="mediaserverclient" filter="s60" name="Media Server Client">
-    <unit bldFile="upnpmediaserver/mediaserverclient/group" filter="!test"/>
-    <unit bldFile="upnpmediaserver/mediaserverclient/tsrc/public/basic/group" filter="test,api_test"/>
-   </component>
-   <component id="connectionmanagerservice" filter="s60" name="Connection Manager Service">
-    <unit bldFile="upnpmediaserver/connectionmanagerservice/group"/>
-   </component>
-   <component id="contentdirectoryservice" filter="s60" name="Content Directory Service">
-    <unit bldFile="upnpmediaserver/contentdirectoryservice/group"/>
-   </component>
-   <component id="mediaserverengine" filter="s60" name="Media Server Engine">
-    <unit bldFile="upnpmediaserver/mediaserverengine/group"/>
+   <component id="upnp_security_plugin_api" name="UPnP Security Plugin API" class="api" filter="s60">
+    <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>
   </collection>
   <collection id="upnpavcontroller" name="UPnP A/V Controller" level="ctrl">
-   <component id="upnpxmlparser" filter="s60" name="UPnP XML Parser" introduced="^2">
-    <unit bldFile="upnpavcontroller/upnpxmlparser/group" filter="!test"/>
-    <unit bldFile="upnpavcontroller/upnpxmlparser/tsrc/upnpxmlparsertest/group" filter="test,api_test"/>
-   </component>
-   <component id="upnpavcontrollerserver" filter="s60" name="UPnP A/V Controller Server" introduced="^2">
-    <unit bldFile="upnpavcontroller/upnpavcontrollerserver/group"/>
-   </component>
    <component id="upnpavcontrollerclient" filter="s60" name="UPnP A/V Ccontroller Client" introduced="^2">
     <unit bldFile="upnpavcontroller/upnpavcontrollerclient/group"/>
    </component>
    <component id="upnpavcontrollerhelper" filter="s60" name="UPnP A/V Controller Helper" introduced="^2">
     <unit bldFile="upnpavcontroller/upnpavcontrollerhelper/group"/>
    </component>
+   <component id="upnpavcontrollerserver" filter="s60" name="UPnP A/V Controller Server" introduced="^2">
+    <unit bldFile="upnpavcontroller/upnpavcontrollerserver/group"/>
+   </component>
    <component id="upnprenderingstatemachine" filter="s60" name="UPnP Rendering State Machine" introduced="^3">
     <unit bldFile="upnpavcontroller/upnprenderingstatemachine/group"/>
+   </component>         
+   <component id="upnpxmlparser" filter="s60" name="UPnP XML Parser" introduced="^2">
+    <unit bldFile="upnpavcontroller/upnpxmlparser/group" filter="!test"/>
+    <unit bldFile="upnpavcontroller/upnpxmlparser/tsrc/upnpxmlparsertest/group" filter="test,api_test"/>
    </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"/>
+   <unit bldFile="upnpframework/group"/>
+   <component id="upnpcommand" filter="s60" name="UPnP Command" introduced="^2">
+    <unit bldFile="upnpframework/upnpcommand/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="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 id="upnpthumbnail" filter="s60" name="UPnP Thumbnail" introduced="^3">
+    <unit bldFile="upnpframework/upnpthumbnail/group"/>
+   </component>            
+   <component id="upnputilities" filter="s60" name="UPnP Utilities" introduced="^2">
+    <unit bldFile="upnpframework/upnputilities/group"/>
+   </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"/>
+    <unit bldFile="upnpmediaserver/avobjects/tsrc/public/basic/group" filter="test,api_test"/>
    </component>
-  </collection>
+   <component id="connectionmanagerservice" filter="s60" name="Connection Manager Service">
+    <unit bldFile="upnpmediaserver/connectionmanagerservice/group"/>
+   </component>
+   <component id="contentdirectoryservice" filter="s60" name="Content Directory Service">
+    <unit bldFile="upnpmediaserver/contentdirectoryservice/group"/>
+   </component>        
+   <component id="mediaserverclient" filter="s60" name="Media Server Client">
+    <unit bldFile="upnpmediaserver/mediaserverclient/group" filter="!test"/>
+    <unit bldFile="upnpmediaserver/mediaserverclient/tsrc/public/basic/group" filter="test,api_test"/>
+   </component>
+   <component id="mediaserverengine" filter="s60" name="Media Server Engine">
+    <unit bldFile="upnpmediaserver/mediaserverengine/group"/>
+   </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>
   </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 
-    <collection id="upnpstack" name="UPnP Stack" level="framework">
-      <component id="upnputils" filter="s60" name="UPnP Utils">
-		  <unit bldFile="upnpstack/upnputils/tsrc/public/basic/group" filter="test,api_test"/>
-      </component>
-      <component id="serviceframework" filter="s60" name="Service Framework">
-		<unit bldFile="upnpstack/serviceframework/tsrc/public/basic/group" filter="test,api_test"/>
-		<unit bldFile="upnpstack/serviceframework/tsrc/private/configtester/group" filter="test,api_test"/>
-      </component>
-      <component id="controlpointbase" filter="s60" name="Control Point Base">
-		<unit bldFile="upnpstack/controlpointbase/tsrc/public/basic/group" filter="test,api_test"/>
-      </component>
-    </collection> -->
   <collection id="upnpsharing" name="UPnP Sharing" level="server">
+   <component id="upnpcontentserver" filter="s60" name="UPnP Content Server" introduced="^2">
+    <unit bldFile="upnpsharing/upnpcontentserver/group"/>
+   </component>    
    <component id="upnpdlnaprofiler" filter="s60" name="UPnP DLNA Profiler" introduced="^2">
     <unit bldFile="upnpsharing/upnpdlnaprofiler/group"/>
    </component>
+   <component id="upnpgstwrapper" filter="s60" name="UPnP GStreamer Wrapper" introduced="^3">
+    <unit bldFile="upnpsharing/upnpgstwrapper/group"/>
+   </component>     
    <component id="upnpsecurity" filter="s60" name="UPnP Security" introduced="^2">
     <unit bldFile="upnpsharing/upnpsecurity/group"/>
    </component>
-   <component id="upnpcontentserver" filter="s60" name="UPnP Content Server" introduced="^2">
-    <unit bldFile="upnpsharing/upnpcontentserver/group"/>
-   </component>
    <component id="upnpsharingalgorithm" filter="s60" name="UPnP Sharing Algorithm" introduced="^3">
     <unit bldFile="upnpsharing/upnpsharingalgorithm/group"/>
    </component>
diff -r b4d83ea1d6e2 -r 9b689d9d3a1c upnpavcontroller/upnpavcontrollerhelper/group/upnpavcontrollerhelper.mmp
--- a/upnpavcontroller/upnpavcontrollerhelper/group/upnpavcontrollerhelper.mmp	Wed Nov 03 12:18:00 2010 +0200
+++ b/upnpavcontroller/upnpavcontrollerhelper/group/upnpavcontrollerhelper.mmp	Fri Nov 05 18:31:17 2010 +0200
@@ -67,7 +67,7 @@
 LIBRARY         caf.lib // WM-DRM
 LIBRARY         cafutils.lib // WM-DRM
 LIBRARY         efsrv.lib // RFs
-LIBRARY         PlatformEnv.lib // PathInfo
+LIBRARY         platformenv.lib // PathInfo
 LIBRARY         insock.lib // TInetAddr
 LIBRARY         esock.lib // TSockAddr 
 
diff -r b4d83ea1d6e2 -r 9b689d9d3a1c upnpframework/upnputilities/group/upnputilities.mmp
--- a/upnpframework/upnputilities/group/upnputilities.mmp	Wed Nov 03 12:18:00 2010 +0200
+++ b/upnpframework/upnputilities/group/upnputilities.mmp	Fri Nov 05 18:31:17 2010 +0200
@@ -59,13 +59,11 @@
 LIBRARY         esock.lib
 LIBRARY         insock.lib
 LIBRARY         commdb.lib
-LIBRARY         PlatformEnv.lib
-
-// Settings Engine
+LIBRARY         platformenv.lib
 LIBRARY         upnpsettingsengine.lib
 
 // Meta data
-LIBRARY         MetaDataUtility.lib
+LIBRARY         metadatautility.lib
 
 // MIME 
 LIBRARY         apmime.lib
@@ -76,7 +74,7 @@
 LIBRARY         cafutils.lib
 
 // CLF
-LIBRARY         ContentListingFramework.lib
+LIBRARY         contentlistingframework.lib
 
 // S60 Upnp Stack
 LIBRARY         upnpipserversutils.lib
diff -r b4d83ea1d6e2 -r 9b689d9d3a1c upnpmediaserver/contentdirectoryservice/group/contentdirectoryservice.mmp
--- a/upnpmediaserver/contentdirectoryservice/group/contentdirectoryservice.mmp	Wed Nov 03 12:18:00 2010 +0200
+++ b/upnpmediaserver/contentdirectoryservice/group/contentdirectoryservice.mmp	Fri Nov 05 18:31:17 2010 +0200
@@ -100,7 +100,7 @@
 LIBRARY         edbms.lib 
 LIBRARY         ecom.lib
 LIBRARY         sysutil.lib
-LIBRARY         PlatformEnv.lib
+LIBRARY         platformenv.lib
 LIBRARY         estlib.lib 
 LIBRARY         inetprotutil.lib
 LIBRARY         imageconversion.lib
diff -r b4d83ea1d6e2 -r 9b689d9d3a1c upnpmediaserver/mediaserverclient/group/mediaserverclient.mmp
--- a/upnpmediaserver/mediaserverclient/group/mediaserverclient.mmp	Wed Nov 03 12:18:00 2010 +0200
+++ b/upnpmediaserver/mediaserverclient/group/mediaserverclient.mmp	Fri Nov 05 18:31:17 2010 +0200
@@ -55,6 +55,6 @@
 LIBRARY         upnpserviceframework.lib
 
 DEBUGLIBRARY    flogger.lib
-DEFFILE         AVMediaServerClient
+DEFFILE         avmediaserverclient
 
 // End of file
diff -r b4d83ea1d6e2 -r 9b689d9d3a1c upnpsettings/upnpsettingsengine/group/upnpsettingsengine.mmp
--- a/upnpsettings/upnpsettingsengine/group/upnpsettingsengine.mmp	Wed Nov 03 12:18:00 2010 +0200
+++ b/upnpsettings/upnpsettingsengine/group/upnpsettingsengine.mmp	Fri Nov 05 18:31:17 2010 +0200
@@ -57,7 +57,7 @@
 LIBRARY estor.lib
 
 // PathInfo
-LIBRARY PlatformEnv.lib
+LIBRARY platformenv.lib
 LIBRARY commdb.lib
 
 // Connection Manager, new APIs for getting IAPs, etc.
diff -r b4d83ea1d6e2 -r 9b689d9d3a1c upnpsharing/upnpcontentserver/group/upnpcontentserver.mmp
--- a/upnpsharing/upnpcontentserver/group/upnpcontentserver.mmp	Wed Nov 03 12:18:00 2010 +0200
+++ b/upnpsharing/upnpcontentserver/group/upnpcontentserver.mmp	Fri Nov 05 18:31:17 2010 +0200
@@ -59,7 +59,7 @@
 LIBRARY estor.lib 
 LIBRARY ws32.lib 
 LIBRARY efsrv.lib 
-LIBRARY PlatformEnv.lib
+LIBRARY platformenv.lib
 LIBRARY centralrepository.lib
 LIBRARY inetprotutil.lib            // for EscapeUtils
 // Content listing framework (metadata)