--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml	Wed Aug 18 10:02:50 2010 +0300
@@ -0,0 +1,245 @@
+<?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="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_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_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"/>
+   </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_plugin_api" name="UPnP Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="dlnasrv_plat/upnp_plugin_api/upnp_plugin_api.metaxml"/>
+    <unit bldFile="dlnasrv_plat/upnp_plugin_api/group" filter="!test"/>
+		<!-- should only have one test unit in a component. Need to #include from a common bld.inf-->
+    <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="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"/>
+    <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>
+   <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">
+    <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="upnpavcontroller_rom" filter="s60" name="UPnP A/V Controller ROM" introduced="^2">
+    <unit bldFile="upnpavcontroller/rom"/>
+   </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 
+    <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="upnpdlnaprofiler" filter="s60" name="UPnP DLNA Profiler" introduced="^2">
+    <unit bldFile="upnpsharing/upnpdlnaprofiler/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="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>
+  </collection>
+ </package>
+</SystemDefinition>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml	Wed Aug 18 10:02:50 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="mw"/>

--- a/upnpavcontroller/group/bld.inf	Fri May 14 16:07:07 2010 +0300
+++ b/upnpavcontroller/group/bld.inf	Wed Aug 18 10:02:50 2010 +0300
@@ -15,32 +15,28 @@
 *
 */
 
-
-
-
-
-
 #include "../../group/upnpplatformvar.hrh"
 
-
 PRJ_PLATFORMS
 
 PRJ_EXPORTS
-// ROM build
-../rom/upnpavcontroller.iby            CORE_MW_LAYER_IBY_EXPORT_PATH(upnpavcontroller.iby)
+// none
 
 PRJ_MMPFILES
 // none
 
-    // upnp xml parser
-    #include "../upnpxmlparser/group/bld.inf"
+// upnp xml parser
+#include "../upnpxmlparser/group/bld.inf"
 
-    // avcontroller server
-    #include "../upnpavcontrollerserver/group/bld.inf"
+// avcontroller server
+#include "../upnpavcontrollerserver/group/bld.inf"
 
-    // avcontroller client
-    #include "../upnpavcontrollerclient/group/bld.inf"
+// avcontroller client
+#include "../upnpavcontrollerclient/group/bld.inf"
 
-    // avcontroller helper
-    #include "../upnpavcontrollerhelper/group/bld.inf"
+// avcontroller helper
+#include "../upnpavcontrollerhelper/group/bld.inf"
 
+// upnpavcontroller ROM
+#include "../rom/bld.inf"
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/upnpavcontroller/rom/bld.inf	Wed Aug 18 10:02:50 2010 +0300
@@ -0,0 +1,29 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:      Build information file for upnpavcontroller ROM
+*
+*/
+
+
+#include "../../group/upnpplatformvar.hrh"
+
+
+PRJ_PLATFORMS
+
+PRJ_EXPORTS
+// ROM build
+../rom/upnpavcontroller.iby            CORE_MW_LAYER_IBY_EXPORT_PATH(upnpavcontroller.iby)
+
+PRJ_MMPFILES
+// none

--- a/upnpavcontrolpoint/avcpengine/inc/upnppathresolver.h	Fri May 14 16:07:07 2010 +0300
+++ b/upnpavcontrolpoint/avcpengine/inc/upnppathresolver.h	Wed Aug 18 10:02:50 2010 +0300
@@ -23,7 +23,7 @@
 //  INCLUDES
 #include <e32base.h>
 
-#include <xmlengdom.h>
+#include <xml/dom/xmlengdom.h>
 
 // FORWARD DECLARATIONS
 class CUpnpPathElement;

--- a/upnpavcontrolpoint/avcpengine/src/upnppathresolver.cpp	Fri May 14 16:07:07 2010 +0300
+++ b/upnpavcontrolpoint/avcpengine/src/upnppathresolver.cpp	Wed Aug 18 10:02:50 2010 +0300
@@ -29,8 +29,8 @@
 
 #include "upnpstring.h"
 
-#include <xmlengdom.h>
-#include <xmlengdomparser.h>
+#include <xml/dom/xmlengdom.h>
+#include <xml/dom/xmlengdomparser.h>
 
 #include "upnpdominterface.h"
 

--- a/upnpavcontrolpoint/avcpengineclient/inc/upnpmetadata.h	Fri May 14 16:07:07 2010 +0300
+++ b/upnpavcontrolpoint/avcpengineclient/inc/upnpmetadata.h	Wed Aug 18 10:02:50 2010 +0300
@@ -23,8 +23,8 @@
 #include <e32base.h>
 #include <e32cmn.h>
  
-#include <xmlengdom.h>
-#include <xmlengdocument.h>
+#include <xml/dom/xmlengdom.h>
+#include <xml/dom/xmlengdocument.h>
 
 //rsfw
 #include <rsfwmountman.h>

--- a/upnpavcontrolpoint/avcpengineclient/src/upnpmetadata.cpp	Fri May 14 16:07:07 2010 +0300
+++ b/upnpavcontrolpoint/avcpengineclient/src/upnpmetadata.cpp	Wed Aug 18 10:02:50 2010 +0300
@@ -21,7 +21,7 @@
 #include "upnpmetadata.h"
 #include "upnpavcpenginemsclient.h"
 #include <upnpdominterface.h>
-#include <XmlEngDOMParser.h>
+#include <xml/dom/xmlengdomparser.h>
 #include <XmlEngSerializationOptions.h>
 #include <Uri16.h>
 

--- a/upnpavcontrolpoint/group/bld.inf	Fri May 14 16:07:07 2010 +0300
+++ b/upnpavcontrolpoint/group/bld.inf	Wed Aug 18 10:02:50 2010 +0300
@@ -1,9 +1,9 @@
 /** @file
-* Copyright (c) 2005-2006 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005-2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
-* which accompanies  this distribution, and is available 
+* which accompanies  this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
@@ -22,11 +22,14 @@
 //DEFAULT
 
 PRJ_EXPORTS
-../rom/upnpavcontrolpoint.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpavcontrolpoint.iby)
 
 PRJ_MMPFILES
 
 #include "../avcontrolframework/group/bld.inf"
+
+// UPnP Stack ROM
+#include "../rom/bld.inf"
+
 /*
 commented-out due to s60 distribution policy
 #include "../avcpengine/group/bld.inf"
@@ -35,4 +38,4 @@
 */
 
 
-//  End of File  
\ No newline at end of file
+//  End of File
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/upnpavcontrolpoint/rom/bld.inf	Wed Aug 18 10:02:50 2010 +0300
@@ -0,0 +1,28 @@
+/** @file
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies  this distribution, and is available 
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Build info for the UPnP Stack ROM
+*
+*/
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+WINSCW ARMV5
+//DEFAULT
+
+PRJ_EXPORTS
+../rom/upnpavcontrolpoint.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpavcontrolpoint.iby)
+
+
+//  End of File  
\ No newline at end of file

--- a/upnpframework/group/bld.inf	Fri May 14 16:07:07 2010 +0300
+++ b/upnpframework/group/bld.inf	Wed Aug 18 10:02:50 2010 +0300
@@ -23,28 +23,16 @@
 DEFAULT
 
 PRJ_EXPORTS
-// ROM build
-../rom/upnpframework.iby               CORE_MW_LAYER_IBY_EXPORT_PATH(upnpframework.iby)
-../rom/upnpframeworkresources.iby      CORE_MW_LAYER_IBY_EXPORT_PATH(upnpframeworkresources.iby)
-// LOC files
-UPNP_LOC_EXPORT(upnpframework.loc)
-// IAD support
-../install/20009cae.cre                /epoc32/release/arm5/urel/z/private/20009cae.cre
-../install/20007564.cre                /epoc32/release/arm5/urel/z/private/20007564.cre
-../install/upnpframework_stub.sis      /epoc32/data/z/system/install/upnpframework_stub.sis
-// upnpframework common headers
-../inc/upnpframeworkfeatures_mmp.hrh   |../../inc/upnpframeworkfeatures_mmp.hrh
-../inc/upnplogging.h                   |../../inc/upnplogging.h
-../inc/upnppanic.h                     |../../inc/upnppanic.h
-../inc/upnplog.h                       |../../inc/upnplog.h
+// none
 
 PRJ_MMPFILES
 // none
 
-    // Build subprojects
+// Build subprojects
 
-    // UpnpUtilities
-    #include "../upnputilities/group/bld.inf"
+// UpnpUtilities
+#include "../upnputilities/group/bld.inf"
+
 #ifdef FF_UPNP_FRAMEWORK_2_0  // UPnP feature flag
      // UPnP (Home Media) Extension plugin interface
     #include "../upnpextensionpluginif/group/bld.inf"
@@ -63,12 +51,14 @@
 
 #endif // FF_UPNP_FRAMEWORK_2_0
 
-    // UpnpMusicAdapter
-    #include "../upnpmusicadapter/group/bld.inf"
-    
-    // UpnpCommand
-    #include "../upnpcommand/group/bld.inf"
+// UpnpMusicAdapter
+#include "../upnpmusicadapter/group/bld.inf"
 
+// UpnpCommand
+#include "../upnpcommand/group/bld.inf"
+
+// Exports for upnpframework
+#include "../rom/bld.inf"
 
 
 // End of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/upnpframework/rom/bld.inf	Wed Aug 18 10:02:50 2010 +0300
@@ -0,0 +1,42 @@
+/*
+* Copyright (c) 2006-2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Exports for upnpframework
+*
+*/
+
+
+// For compatibility with S60 3.2 and IAD branch
+#include "../../group/upnpplatformvar.hrh"
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+// ROM build
+upnpframework.iby               CORE_MW_LAYER_IBY_EXPORT_PATH(upnpframework.iby)
+upnpframeworkresources.iby      CORE_MW_LAYER_IBY_EXPORT_PATH(upnpframeworkresources.iby)
+// LOC files
+UPNP_LOC_EXPORT(upnpframework.loc)
+// IAD support
+../install/20009cae.cre                /epoc32/release/arm5/urel/z/private/20009cae.cre
+../install/20007564.cre                /epoc32/release/arm5/urel/z/private/20007564.cre
+../install/upnpframework_stub.sis      /epoc32/data/z/system/install/upnpframework_stub.sis
+// upnpframework common headers
+../inc/upnpframeworkfeatures_mmp.hrh   |../../inc/upnpframeworkfeatures_mmp.hrh
+../inc/upnplogging.h                   |../../inc/upnplogging.h
+../inc/upnppanic.h                     |../../inc/upnppanic.h
+../inc/upnplog.h                       |../../inc/upnplog.h
+
+
+// End of file

--- a/upnpharvester/group/bld.inf	Fri May 14 16:07:07 2010 +0300
+++ b/upnpharvester/group/bld.inf	Wed Aug 18 10:02:50 2010 +0300
@@ -15,22 +15,12 @@
 *
 */
 
-
-
-
-
-
 #include "../../group/upnpplatformvar.hrh"
 
-
 PRJ_PLATFORMS
-
 DEFAULT
 
 PRJ_EXPORTS
-../install/upnpharvester_stub.SIS   /epoc32/data/z/system/install/upnpharvester_stub.sis
-../install/10281fab.cre             /epoc32/release/armv5/urel/z/private/10202be9/10281fab.cre
-../rom/upnpharvester.iby            CORE_MW_LAYER_IBY_EXPORT_PATH(upnpharvester.iby)
 
 PRJ_MMPFILES
 
@@ -41,6 +31,9 @@
 #include "../cdssync/common/bld.inf"
 #include "../mdhserver/group/bld.inf"
 
+// CM Metadata Harvester ROM
+#include "../rom/bld.inf"
+
 PRJ_TESTMMPFILES
 
 PRJ_TESTEXPORTS

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/upnpharvester/rom/bld.inf	Wed Aug 18 10:02:50 2010 +0300
@@ -0,0 +1,43 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:      Build information file for CM Metadata Harvester ROM
+*
+*/
+
+
+
+
+
+
+#include "../../group/upnpplatformvar.hrh"
+
+
+PRJ_PLATFORMS
+
+DEFAULT
+
+PRJ_EXPORTS
+../install/upnpharvester_stub.SIS   /epoc32/data/z/system/install/upnpharvester_stub.sis
+../install/10281fab.cre             /epoc32/release/armv5/urel/z/private/10202be9/10281fab.cre
+../rom/upnpharvester.iby            CORE_MW_LAYER_IBY_EXPORT_PATH(upnpharvester.iby)
+
+PRJ_MMPFILES
+
+PRJ_TESTMMPFILES
+
+PRJ_TESTEXPORTS
+
+// None
+
+//  End of File

--- a/upnpmediaserver/contentdirectoryservice/inc/upnpcdutils.h	Fri May 14 16:07:07 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/inc/upnpcdutils.h	Wed Aug 18 10:02:50 2010 +0300
@@ -21,7 +21,7 @@
 #define CDUTILS_H
 
 //  INCLUDES
-#include <xmlengdom.h>
+#include <xml/dom/xmlengdom.h>
 #include <e32base.h>
 
 

--- a/upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectory.h	Fri May 14 16:07:07 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectory.h	Wed Aug 18 10:02:50 2010 +0300
@@ -25,7 +25,7 @@
 #include "upnpelementfactory.h"
 
 // new xml
-#include <xmlengdom.h>
+#include <xml/dom/xmlengdom.h>
 
 #include "upnpfiletransfer.h"
 #include "upnpcontentdirectorydatafinder.h"

--- a/upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectorydb.h	Fri May 14 16:07:07 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectorydb.h	Wed Aug 18 10:02:50 2010 +0300
@@ -26,7 +26,7 @@
 #include <s32file.h>
 #include <flogger.h>
 #include <upnperrors.h>
-#include <xmlengdom.h>
+#include <xml/dom/xmlengdom.h>
 
 
 // CLASS DECLARATION

--- a/upnpmediaserver/contentdirectoryservice/inc/upnpelementfactory.h	Fri May 14 16:07:07 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/inc/upnpelementfactory.h	Wed Aug 18 10:02:50 2010 +0300
@@ -22,8 +22,8 @@
 
 // INCLUDES
 
-#include <xmlengdom.h>
-#include <xmlengdocument.h>
+#include <xml/dom/xmlengdom.h>
+#include <xml/dom/xmlengdocument.h>
 #include "upnpcontentdirectory.h"
 #include "upnpfiletransfer.h"
 #include "upnperrors.h" // Added by ClassView

--- a/upnpmediaserver/contentdirectoryservice/inc/upnpmetadatastorage.h	Fri May 14 16:07:07 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/inc/upnpmetadatastorage.h	Wed Aug 18 10:02:50 2010 +0300
@@ -26,7 +26,7 @@
 #include <d32dbms.h>
 #include <s32file.h>
 #include <upnperrors.h>
-#include <xmlengdom.h>
+#include <xml/dom/xmlengdom.h>
 
 // FORWARD DECLARATIONS
 class CUpnpObjectBean;

--- a/upnpmediaserver/contentdirectoryservice/inc/upnpmspathutility.h	Fri May 14 16:07:07 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/inc/upnpmspathutility.h	Wed Aug 18 10:02:50 2010 +0300
@@ -26,7 +26,7 @@
 // INCLUDE FILES
 #include <e32base.h>    // CBase
 #include <f32file.h>    // TDriveNumber
-#include <xmlengdom.h>
+#include <xml/dom/xmlengdom.h>
 
 // FORWARD DECLARATIONS
 class CRepository;

--- a/upnpmediaserver/contentdirectoryservice/inc/upnpobjectbean.h	Fri May 14 16:07:07 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/inc/upnpobjectbean.h	Wed Aug 18 10:02:50 2010 +0300
@@ -24,7 +24,7 @@
 #include "upnptablebean.h"
 #include <e32base.h>
 #include <d32dbms.h>
-#include <xmlengdom.h>
+#include <xml/dom/xmlengdom.h>
 
 class CUpnpObject;
 

--- a/upnpmediaserver/contentdirectoryservice/inc/upnpxmlcontentfilter.h	Fri May 14 16:07:07 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/inc/upnpxmlcontentfilter.h	Wed Aug 18 10:02:50 2010 +0300
@@ -19,8 +19,8 @@
 // INCLUDE FILES
 
 #include <e32svr.h>
-#include <xmlengdom.h>
-#include <xmlengnodefilter.h>
+#include <xml/dom/xmlengdom.h>
+#include <xml/dom/xmlengnodefilter.h>
 
 //using namespace Xml;
 
@@ -50,4 +50,4 @@
     */
     static HBufC8* SerializeLC(RXmlEngDocument& aDoc, TXmlEngElement& aElement );
 
-    };
\ No newline at end of file
+    };

--- a/upnpmediaserver/contentdirectoryservice/src/upnpattributebean.cpp	Fri May 14 16:07:07 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/src/upnpattributebean.cpp	Wed Aug 18 10:02:50 2010 +0300
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include <xmlengdom.h>
+#include <xml/dom/xmlengdom.h>
 #include "upnpattributebean.h"
 #include "upnpcontentdirectoryglobals.h"
 #include <upnpattribute.h>

--- a/upnpmediaserver/contentdirectoryservice/src/upnpcdutils.cpp	Fri May 14 16:07:07 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/src/upnpcdutils.cpp	Wed Aug 18 10:02:50 2010 +0300
@@ -27,7 +27,7 @@
 #include "upnpstring.h"
 #include "upnpcons.h"
 #include <utf.h>
-#include <xmlengdocument.h>
+#include <xml/dom/xmlengdocument.h>
 #include <e32math.h>
 
 // ============================ MEMBER FUNCTIONS ===============================

--- a/upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectory.cpp	Fri May 14 16:07:07 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectory.cpp	Wed Aug 18 10:02:50 2010 +0300
@@ -20,9 +20,9 @@
 #include <fbs.h>
 #include <uri8.h>
 #include <pathinfo.h>
-#include <xmlengdom.h>
-#include <xmlengserializationoptions.h>
-#include <xmlengdomparser.h>
+#include <xml/dom/xmlengdom.h>
+#include <xml/dom/xmlengserializationoptions.h>
+#include <xml/dom/xmlengdomparser.h>
 #include <sysutil.h>
 #include <bautils.h>
 #include <caf/caf.h>

--- a/upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectorydb.cpp	Fri May 14 16:07:07 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectorydb.cpp	Wed Aug 18 10:02:50 2010 +0300
@@ -20,7 +20,7 @@
 #include <barsread.h>
 #include <barsc.h>   
 #include <f32file.h>
-#include <xmlengdom.h>
+#include <xml/dom/xmlengdom.h>
 #include <sysutil.h>
 #include <upnpdominterface.h>
 #include <upnpstring.h>

--- a/upnpmediaserver/contentdirectoryservice/src/upnpelementbean.cpp	Fri May 14 16:07:07 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/src/upnpelementbean.cpp	Wed Aug 18 10:02:50 2010 +0300
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include <xmlengdom.h>
+#include <xml/dom/xmlengdom.h>
 #include "upnpelementbean.h"
 #include "upnpcontentdirectoryglobals.h"
 #include "upnpcdutils.h"

--- a/upnpmediaserver/contentdirectoryservice/src/upnpelementfactory.cpp	Fri May 14 16:07:07 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/src/upnpelementfactory.cpp	Wed Aug 18 10:02:50 2010 +0300
@@ -19,7 +19,7 @@
 // INCLUDE FILES
 #include <sysutil.h>
 #include <uri8.h>
-#include <xmlengdomparser.h>
+#include <xml/dom/xmlengdomparser.h>
 
 #include "upnpelementfactory.h"
 #include "upnpcontentdirectoryglobals.h"

--- a/upnpmediaserver/contentdirectoryservice/src/upnpxmlcontentfilter.cpp	Fri May 14 16:07:07 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/src/upnpxmlcontentfilter.cpp	Wed Aug 18 10:02:50 2010 +0300
@@ -23,8 +23,8 @@
 
 #include <xml/parser.h>
 #include <xml/parserfeature.h>
-#include <xmlengnodefilter.h>
-#include <xmlengdomparser.h>
+#include <xml/dom/xmlengnodefilter.h>
+#include <xml/dom/xmlengdomparser.h>
 
 #include <charconv.h>
 #include <utf.h>

--- a/upnpmediaserver/group/bld.inf	Fri May 14 16:07:07 2010 +0300
+++ b/upnpmediaserver/group/bld.inf	Wed Aug 18 10:02:50 2010 +0300
@@ -1,9 +1,9 @@
 /** @file
-* Copyright (c) 2005-2006 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005-2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
-* which accompanies  this distribution, and is available 
+* which accompanies  this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
@@ -22,9 +22,6 @@
 //DEFAULT
 
 PRJ_EXPORTS
-../rom/upnpmediaserver.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpmediaserver.iby)
-../conf/upnpmediaserver.confml MW_LAYER_CONFML(upnpmediaserver.confml)
-../conf/upnpmediaserver_101F978F.crml MW_LAYER_CRML(upnpmediaserver_101F978F.crml)
 
 PRJ_MMPFILES
 
@@ -33,6 +30,7 @@
 #include "../connectionmanagerservice/group/bld.inf"
 #include "../contentdirectoryservice/group/bld.inf"
 #include "../mediaserverengine/group/bld.inf"
+#include "../rom/bld.inf"
 
 
-//  End of File  
\ No newline at end of file
+//  End of File
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/upnpmediaserver/rom/bld.inf	Wed Aug 18 10:02:50 2010 +0300
@@ -0,0 +1,30 @@
+/** @file
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies  this distribution, and is available 
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Build info for the UPnP Stack subsystem ROM
+*
+*/
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+WINSCW ARMV5
+//DEFAULT
+
+PRJ_EXPORTS
+../rom/upnpmediaserver.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpmediaserver.iby)
+../conf/upnpmediaserver.confml MW_LAYER_CONFML(upnpmediaserver.confml)
+../conf/upnpmediaserver_101F978F.crml MW_LAYER_CRML(upnpmediaserver_101F978F.crml)
+
+
+//  End of File  
\ No newline at end of file

--- a/upnpmpxplugins/group/bld.inf	Fri May 14 16:07:07 2010 +0300
+++ b/upnpmpxplugins/group/bld.inf	Wed Aug 18 10:02:50 2010 +0300
@@ -15,23 +15,18 @@
 *
 */
 
-
-
-
-
-
 #include "../../group/upnpplatformvar.hrh"
 
 PRJ_PLATFORMS
 
 PRJ_EXPORTS
-// ROM build
-../rom/upnpmpxplugins.iby               CORE_MW_LAYER_IBY_EXPORT_PATH(upnpmpxplugins.iby)
 
 PRJ_MMPFILES
-// none
 
-    // playback plugins
-    #include "../upnpplaybackplugins/group/bld.inf"
+// playback plugins
+#include "../upnpplaybackplugins/group/bld.inf"
+
+// upnpmpxplugins ROM
+#include "../rom/bld.inf"
 
 // end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/upnpmpxplugins/rom/bld.inf	Wed Aug 18 10:02:50 2010 +0300
@@ -0,0 +1,33 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:      Build information file for upnpmpxplugins ROM
+*
+*/
+
+
+
+
+
+
+#include "../../group/upnpplatformvar.hrh"
+
+PRJ_PLATFORMS
+
+PRJ_EXPORTS
+// ROM build
+../rom/upnpmpxplugins.iby               CORE_MW_LAYER_IBY_EXPORT_PATH(upnpmpxplugins.iby)
+
+PRJ_MMPFILES
+// none
+// end of file

--- a/upnpsettings/group/bld.inf	Fri May 14 16:07:07 2010 +0300
+++ b/upnpsettings/group/bld.inf	Wed Aug 18 10:02:50 2010 +0300
@@ -15,28 +15,21 @@
 *
 */
 
-
-
-
-
-
 // For compatibility with S60 3.2 and IAD branch
 #include "../../group/upnpplatformvar.hrh"
 
 PRJ_PLATFORMS
 
 PRJ_EXPORTS
-// ROM build
-../rom/upnpsettings.iby               CORE_MW_LAYER_IBY_EXPORT_PATH(upnpsettings.iby)
-../rom/upnpsettingsresources.iby      CORE_MW_LAYER_IBY_EXPORT_PATH(upnpsettingsresources.iby)
-// LOC files
-UPNP_LOC_EXPORT(upnpsettings.loc)
 
 PRJ_MMPFILES
-// none
+
+// settings engine
+#include "../upnpsettingsengine/group/bld.inf"
 
-    // settings engine
-    #include "../upnpsettingsengine/group/bld.inf"
+// Exports for upnpsettings
+#include "../rom/bld.inf"
+
 #ifdef FF_UPNP_FRAMEWORK_2_0  // UPnP feature flag
     // multiselectionui
     #include "../multiselectionui/group/bld.inf"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/upnpsettings/rom/bld.inf	Wed Aug 18 10:02:50 2010 +0300
@@ -0,0 +1,38 @@
+/*
+* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:      Exports for upnpsettings
+*
+*/
+
+
+
+
+
+
+// For compatibility with S60 3.2 and IAD branch
+#include "../../group/upnpplatformvar.hrh"
+
+PRJ_PLATFORMS
+
+PRJ_EXPORTS
+// ROM build
+upnpsettings.iby               CORE_MW_LAYER_IBY_EXPORT_PATH(upnpsettings.iby)
+upnpsettingsresources.iby      CORE_MW_LAYER_IBY_EXPORT_PATH(upnpsettingsresources.iby)
+// LOC files
+UPNP_LOC_EXPORT(upnpsettings.loc)
+
+PRJ_MMPFILES
+// none
+
+// end of file

--- a/upnpsharing/group/bld.inf	Fri May 14 16:07:07 2010 +0300
+++ b/upnpsharing/group/bld.inf	Wed Aug 18 10:02:50 2010 +0300
@@ -15,36 +15,28 @@
 *
 */
 
-
-
-
-
-
 // For compatibility with S60 3.2 and IAD branch
 #include "../../group/upnpplatformvar.hrh"
 
 PRJ_PLATFORMS
 
 PRJ_EXPORTS
-// ROM build
-../rom/upnpsharing.iby               CORE_MW_LAYER_IBY_EXPORT_PATH(upnpsharing.iby)
-../rom/upnpsharingresources.iby      CORE_MW_LAYER_IBY_EXPORT_PATH(upnpsharingresources.iby)
-// LOC files
-UPNP_LOC_EXPORT(upnpsharing.loc)
 
 PRJ_MMPFILES
-// none
 
-    // The DLNA profiler
-    #include "../upnpdlnaprofiler/group/bld.inf"
+// The DLNA profiler
+#include "../upnpdlnaprofiler/group/bld.inf"
+
+// upnp security
+#include "../upnpsecurity/group/bld.inf"
 
-    // upnp security
-    #include "../upnpsecurity/group/bld.inf"
+// content server and server client
+#include "../upnpcontentserver/group/bld.inf"
 
-    // content server and server client
-    #include "../upnpcontentserver/group/bld.inf"
+// content server API
+#include "../applicationengine/group/bld.inf"
 
-    // content server API
-    #include "../applicationengine/group/bld.inf"
+// Exports for upnpsharing
+#include "../rom/bld.inf"
 
 // end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/upnpsharing/rom/bld.inf	Wed Aug 18 10:02:50 2010 +0300
@@ -0,0 +1,38 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:      Build information file for upnpsharing ROM
+*
+*/
+
+
+
+
+
+
+// For compatibility with S60 3.2 and IAD branch
+#include "../../group/upnpplatformvar.hrh"
+
+PRJ_PLATFORMS
+
+PRJ_EXPORTS
+// ROM build
+../rom/upnpsharing.iby               CORE_MW_LAYER_IBY_EXPORT_PATH(upnpsharing.iby)
+../rom/upnpsharingresources.iby      CORE_MW_LAYER_IBY_EXPORT_PATH(upnpsharingresources.iby)
+// LOC files
+UPNP_LOC_EXPORT(upnpsharing.loc)
+
+PRJ_MMPFILES
+// none
+
+// end of file