# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1266324485 0
# Node ID e379d83ca22e199f9ded6d42dd91fc53fc04b410
# Parent  6b67dabb20d8300d0b88840dac6038836d887e33# Parent  0602da5051973d8fe9b908f3d8402ed459b70d39
Merge branches

diff -r 0602da505197 -r e379d83ca22e symbian3/mw/dlnasrv/package_definition.xml
--- a/symbian3/mw/dlnasrv/package_definition.xml	Mon Feb 15 18:25:55 2010 +0000
+++ b/symbian3/mw/dlnasrv/package_definition.xml	Tue Feb 16 12:48:05 2010 +0000
@@ -77,6 +77,7 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <block name="dlnasrv" level="specific" long-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 name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
           <component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
             <unit bldFile="/sf/mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
@@ -130,19 +131,19 @@
             <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnputilities/group"/>
           </component>
           <component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-            <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpextensionpluginif/group"/>
+            <!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
           </component>
           <component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-            <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpfiletransferengine/group"/>
+            <!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
           </component>
           <component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-            <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpcommonui/group"/>
+            <!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
           </component>
           <component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-            <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpaiwengine/group"/>
+            <!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
           </component>
           <component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-            <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpaiwprovider/group"/>
+            <!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
           </component>
           <component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
             <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
@@ -160,13 +161,13 @@
             <unit bldFile="/sf/mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
           </component>
           <component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-            <unit bldFile="/sf/mw/dlnasrv/upnpsettings/multiselectionui/group"/>
+            <!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
           </component>
           <component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-            <unit bldFile="/sf/mw/dlnasrv/upnpsettings/appwizard/group"/>
+            <!--<unit bldFile="upnpsettings/appwizard/group"/>-->
           </component>
           <component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-            <unit bldFile="/sf/mw/dlnasrv/upnpsettings/upnpsharingui/group"/>
+            <!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
           </component>
           <component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
             <unit bldFile="/sf/mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
@@ -204,34 +205,34 @@
           </component>
         </collection>
         <collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-          <component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3">
+          <component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
             <!-- need to merge or #include these to a single bld.inf -->
-            <unit bldFile="/sf/mw/dlnasrv/upnpharvester/common/cmlibrary/group"/>
-            <unit bldFile="/sf/mw/dlnasrv/upnpharvester/common/cmsettings/group"/>
-            <unit bldFile="/sf/mw/dlnasrv/upnpharvester/common/cmsqlwrapper/group"/>
-            <unit bldFile="/sf/mw/dlnasrv/upnpharvester/common/dbmanager/group"/>
+            <!--<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 name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3">
-            <unit bldFile="/sf/mw/dlnasrv/upnpharvester/cdssync/common"/>
+          <component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
+            <!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
           </component>
-          <component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3">
-            <unit bldFile="/sf/mw/dlnasrv/upnpharvester/mdhserver/group"/>
+          <component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
+            <!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
           </component>
-          <component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3">
+          <component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
             <!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-            <unit bldFile="/sf/mw/dlnasrv/upnpharvester/group"/>
+            <!--<unit bldFile="upnpharvester/group"/>-->
           </component>
         </collection>
         <collection name="homesync" long-name="Home Sync" level="plugin">
-          <component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3">
-            <unit bldFile="/sf/mw/dlnasrv/homesync/group"/>
+          <component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
+            <!-- <unit bldFile="homesync/group"/>-->
             <!-- move bld.inf into contentmanager dir -->
           </component>
         </collection>
         <collection name="homemedia" long-name="Home Media" level="framework">
           <!-- collection is really just a component. Move down a directory -->
-          <component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3">
-            <unit bldFile="/sf/mw/dlnasrv/homemedia/group"/>
+          <component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
+            <!-- <unit bldFile="homemedia/group"/> -->
           </component>
         </collection>
         <collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
diff -r 0602da505197 -r e379d83ca22e symbian3/mw/dlnasrv/package_definition_3.0.xml
--- a/symbian3/mw/dlnasrv/package_definition_3.0.xml	Mon Feb 15 18:25:55 2010 +0000
+++ b/symbian3/mw/dlnasrv/package_definition_3.0.xml	Tue Feb 16 12:48:05 2010 +0000
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <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="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"/>
@@ -57,31 +58,31 @@
       	<meta rel="config">
       		<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
       	</meta>      
-        <unit bldFile="upnpframework/upnpextensionpluginif/group"/>
+        <!-- <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"/>
+        <!-- <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"/>
+        <!--<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"/>
+        <!--<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"/>
+        <!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
       </component>
       <component id="upnpmusicadapter" filter="s60" name="UPnP Music Adapter" introduced="^2">
         <unit bldFile="upnpframework/upnpmusicadapter/group"/>
@@ -102,19 +103,19 @@
       	<meta rel="config">
       		<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
       	</meta>      
-        <unit bldFile="upnpsettings/multiselectionui/group"/>
+        <!--<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"/>
+        <!--<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"/>
+        <!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
       </component>
       <component id="upnpgsplugin" filter="s60" name="UPnP GS Plugin" class="plugin" introduced="^2">
         <unit bldFile="upnpsettings/upnpgsplugin/group"/>
@@ -157,20 +158,20 @@
       	</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/cmlibrary/group"/>
         <unit bldFile="upnpharvester/common/cmsettings/group"/>
         <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
-        <unit bldFile="upnpharvester/common/dbmanager/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"/>
+       <!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
       </component>
       <component id="mdhserver" filter="s60" name="Metadata Harvester Server" introduced="^2" deprecated="^3">
-        <unit bldFile="upnpharvester/mdhserver/group"/>
+        <!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
       </component>
       <component id="upnpharvester_build" filter="s60" name="UPnP Harvester Build" introduced="^2" deprecated="^3">
 		<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-        <unit bldFile="upnpharvester/group"/>
+        <!--<unit bldFile="upnpharvester/group"/>-->
       </component>
     </collection>
     <collection id="homesync" name="Home Sync" level="plugin">
@@ -178,16 +179,16 @@
       		<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 -->
+        <!-- <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>          
+      	</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"/>
+        <!-- <unit bldFile="homemedia/group"/> -->
       </component>
     </collection>
     <collection id="dlnasrv_info" name="DLNA Services Info" level="plugin">