Revert incorrect RCL_3 drop: RCL_3 PDK_3.0.2 PDK_3.0.3 PDK_3.0.4
authorPat Downey <patd@symbian.org>
Wed, 01 Sep 2010 12:16:49 +0100
branchRCL_3
changeset 13 e0762c15653a
parent 12 cdcbf344a1d3
Revert incorrect RCL_3 drop: Revision: 201012 Kit: 201035
package_definition.xml
package_map.xml
upnpavcontroller/group/bld.inf
upnpavcontroller/rom/bld.inf
upnpavcontrolpoint/avcpengine/inc/upnppathresolver.h
upnpavcontrolpoint/avcpengine/src/upnppathresolver.cpp
upnpavcontrolpoint/avcpengineclient/inc/upnpmetadata.h
upnpavcontrolpoint/avcpengineclient/src/upnpmetadata.cpp
upnpavcontrolpoint/group/bld.inf
upnpavcontrolpoint/rom/bld.inf
upnpframework/group/bld.inf
upnpframework/rom/bld.inf
upnpharvester/group/bld.inf
upnpharvester/rom/bld.inf
upnpmediaserver/contentdirectoryservice/inc/upnpcdutils.h
upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectory.h
upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectorydb.h
upnpmediaserver/contentdirectoryservice/inc/upnpelementfactory.h
upnpmediaserver/contentdirectoryservice/inc/upnpmetadatastorage.h
upnpmediaserver/contentdirectoryservice/inc/upnpmspathutility.h
upnpmediaserver/contentdirectoryservice/inc/upnpobjectbean.h
upnpmediaserver/contentdirectoryservice/inc/upnpxmlcontentfilter.h
upnpmediaserver/contentdirectoryservice/src/upnpattributebean.cpp
upnpmediaserver/contentdirectoryservice/src/upnpcdutils.cpp
upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectory.cpp
upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectorydb.cpp
upnpmediaserver/contentdirectoryservice/src/upnpelementbean.cpp
upnpmediaserver/contentdirectoryservice/src/upnpelementfactory.cpp
upnpmediaserver/contentdirectoryservice/src/upnpxmlcontentfilter.cpp
upnpmediaserver/group/bld.inf
upnpmediaserver/rom/bld.inf
upnpmpxplugins/group/bld.inf
upnpmpxplugins/rom/bld.inf
upnpsettings/group/bld.inf
upnpsettings/rom/bld.inf
upnpsettings/upnpsettingsengine/group/upnpsettingsengine.mmp
upnpsettings/upnpsettingsengine/src/upnpsettingsengine.cpp
upnpsharing/group/bld.inf
upnpsharing/rom/bld.inf
--- a/package_definition.xml	Tue Aug 31 15:29:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,245 +0,0 @@
-<?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>
--- a/package_map.xml	Tue Aug 31 15:29:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<PackageMap root="sf" layer="mw"/>
--- a/upnpavcontroller/group/bld.inf	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpavcontroller/group/bld.inf	Wed Sep 01 12:16:49 2010 +0100
@@ -15,28 +15,32 @@
 *
 */
 
+
+
+
+
+
 #include "../../group/upnpplatformvar.hrh"
 
+
 PRJ_PLATFORMS
 
 PRJ_EXPORTS
-// none
+// ROM build
+../rom/upnpavcontroller.iby            CORE_MW_LAYER_IBY_EXPORT_PATH(upnpavcontroller.iby)
 
 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"
-
--- a/upnpavcontroller/rom/bld.inf	Tue Aug 31 15:29:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* 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	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpavcontrolpoint/avcpengine/inc/upnppathresolver.h	Wed Sep 01 12:16:49 2010 +0100
@@ -23,7 +23,7 @@
 //  INCLUDES
 #include <e32base.h>
 
-#include <xml/dom/xmlengdom.h>
+#include <xmlengdom.h>
 
 // FORWARD DECLARATIONS
 class CUpnpPathElement;
--- a/upnpavcontrolpoint/avcpengine/src/upnppathresolver.cpp	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpavcontrolpoint/avcpengine/src/upnppathresolver.cpp	Wed Sep 01 12:16:49 2010 +0100
@@ -29,8 +29,8 @@
 
 #include "upnpstring.h"
 
-#include <xml/dom/xmlengdom.h>
-#include <xml/dom/xmlengdomparser.h>
+#include <xmlengdom.h>
+#include <xmlengdomparser.h>
 
 #include "upnpdominterface.h"
 
--- a/upnpavcontrolpoint/avcpengineclient/inc/upnpmetadata.h	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpavcontrolpoint/avcpengineclient/inc/upnpmetadata.h	Wed Sep 01 12:16:49 2010 +0100
@@ -23,8 +23,8 @@
 #include <e32base.h>
 #include <e32cmn.h>
  
-#include <xml/dom/xmlengdom.h>
-#include <xml/dom/xmlengdocument.h>
+#include <xmlengdom.h>
+#include <xmlengdocument.h>
 
 //rsfw
 #include <rsfwmountman.h>
--- a/upnpavcontrolpoint/avcpengineclient/src/upnpmetadata.cpp	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpavcontrolpoint/avcpengineclient/src/upnpmetadata.cpp	Wed Sep 01 12:16:49 2010 +0100
@@ -21,7 +21,7 @@
 #include "upnpmetadata.h"
 #include "upnpavcpenginemsclient.h"
 #include <upnpdominterface.h>
-#include <xml/dom/xmlengdomparser.h>
+#include <XmlEngDOMParser.h>
 #include <XmlEngSerializationOptions.h>
 #include <Uri16.h>
 
--- a/upnpavcontrolpoint/group/bld.inf	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpavcontrolpoint/group/bld.inf	Wed Sep 01 12:16:49 2010 +0100
@@ -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,14 +22,11 @@
 //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"
@@ -38,4 +35,4 @@
 */
 
 
-//  End of File
\ No newline at end of file
+//  End of File  
\ No newline at end of file
--- a/upnpavcontrolpoint/rom/bld.inf	Tue Aug 31 15:29:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/** @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	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpframework/group/bld.inf	Wed Sep 01 12:16:49 2010 +0100
@@ -23,16 +23,28 @@
 DEFAULT
 
 PRJ_EXPORTS
-// none
+// 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
 
 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"
@@ -51,14 +63,12 @@
 
 #endif // FF_UPNP_FRAMEWORK_2_0
 
-// UpnpMusicAdapter
-#include "../upnpmusicadapter/group/bld.inf"
+    // UpnpMusicAdapter
+    #include "../upnpmusicadapter/group/bld.inf"
+    
+    // UpnpCommand
+    #include "../upnpcommand/group/bld.inf"
 
-// UpnpCommand
-#include "../upnpcommand/group/bld.inf"
-
-// Exports for upnpframework
-#include "../rom/bld.inf"
 
 
 // End of file
--- a/upnpframework/rom/bld.inf	Tue Aug 31 15:29:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
-* 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	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpharvester/group/bld.inf	Wed Sep 01 12:16:49 2010 +0100
@@ -15,12 +15,22 @@
 *
 */
 
+
+
+
+
+
 #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
 
@@ -31,9 +41,6 @@
 #include "../cdssync/common/bld.inf"
 #include "../mdhserver/group/bld.inf"
 
-// CM Metadata Harvester ROM
-#include "../rom/bld.inf"
-
 PRJ_TESTMMPFILES
 
 PRJ_TESTEXPORTS
--- a/upnpharvester/rom/bld.inf	Tue Aug 31 15:29:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
-* 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	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/inc/upnpcdutils.h	Wed Sep 01 12:16:49 2010 +0100
@@ -21,7 +21,7 @@
 #define CDUTILS_H
 
 //  INCLUDES
-#include <xml/dom/xmlengdom.h>
+#include <xmlengdom.h>
 #include <e32base.h>
 
 
--- a/upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectory.h	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectory.h	Wed Sep 01 12:16:49 2010 +0100
@@ -25,7 +25,7 @@
 #include "upnpelementfactory.h"
 
 // new xml
-#include <xml/dom/xmlengdom.h>
+#include <xmlengdom.h>
 
 #include "upnpfiletransfer.h"
 #include "upnpcontentdirectorydatafinder.h"
--- a/upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectorydb.h	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectorydb.h	Wed Sep 01 12:16:49 2010 +0100
@@ -26,7 +26,7 @@
 #include <s32file.h>
 #include <flogger.h>
 #include <upnperrors.h>
-#include <xml/dom/xmlengdom.h>
+#include <xmlengdom.h>
 
 
 // CLASS DECLARATION
--- a/upnpmediaserver/contentdirectoryservice/inc/upnpelementfactory.h	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/inc/upnpelementfactory.h	Wed Sep 01 12:16:49 2010 +0100
@@ -22,8 +22,8 @@
 
 // INCLUDES
 
-#include <xml/dom/xmlengdom.h>
-#include <xml/dom/xmlengdocument.h>
+#include <xmlengdom.h>
+#include <xmlengdocument.h>
 #include "upnpcontentdirectory.h"
 #include "upnpfiletransfer.h"
 #include "upnperrors.h" // Added by ClassView
--- a/upnpmediaserver/contentdirectoryservice/inc/upnpmetadatastorage.h	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/inc/upnpmetadatastorage.h	Wed Sep 01 12:16:49 2010 +0100
@@ -26,7 +26,7 @@
 #include <d32dbms.h>
 #include <s32file.h>
 #include <upnperrors.h>
-#include <xml/dom/xmlengdom.h>
+#include <xmlengdom.h>
 
 // FORWARD DECLARATIONS
 class CUpnpObjectBean;
--- a/upnpmediaserver/contentdirectoryservice/inc/upnpmspathutility.h	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/inc/upnpmspathutility.h	Wed Sep 01 12:16:49 2010 +0100
@@ -26,7 +26,7 @@
 // INCLUDE FILES
 #include <e32base.h>    // CBase
 #include <f32file.h>    // TDriveNumber
-#include <xml/dom/xmlengdom.h>
+#include <xmlengdom.h>
 
 // FORWARD DECLARATIONS
 class CRepository;
--- a/upnpmediaserver/contentdirectoryservice/inc/upnpobjectbean.h	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/inc/upnpobjectbean.h	Wed Sep 01 12:16:49 2010 +0100
@@ -24,7 +24,7 @@
 #include "upnptablebean.h"
 #include <e32base.h>
 #include <d32dbms.h>
-#include <xml/dom/xmlengdom.h>
+#include <xmlengdom.h>
 
 class CUpnpObject;
 
--- a/upnpmediaserver/contentdirectoryservice/inc/upnpxmlcontentfilter.h	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/inc/upnpxmlcontentfilter.h	Wed Sep 01 12:16:49 2010 +0100
@@ -19,8 +19,8 @@
 // INCLUDE FILES
 
 #include <e32svr.h>
-#include <xml/dom/xmlengdom.h>
-#include <xml/dom/xmlengnodefilter.h>
+#include <xmlengdom.h>
+#include <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	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/src/upnpattributebean.cpp	Wed Sep 01 12:16:49 2010 +0100
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include <xml/dom/xmlengdom.h>
+#include <xmlengdom.h>
 #include "upnpattributebean.h"
 #include "upnpcontentdirectoryglobals.h"
 #include <upnpattribute.h>
--- a/upnpmediaserver/contentdirectoryservice/src/upnpcdutils.cpp	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/src/upnpcdutils.cpp	Wed Sep 01 12:16:49 2010 +0100
@@ -27,7 +27,7 @@
 #include "upnpstring.h"
 #include "upnpcons.h"
 #include <utf.h>
-#include <xml/dom/xmlengdocument.h>
+#include <xmlengdocument.h>
 #include <e32math.h>
 
 // ============================ MEMBER FUNCTIONS ===============================
--- a/upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectory.cpp	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectory.cpp	Wed Sep 01 12:16:49 2010 +0100
@@ -20,9 +20,9 @@
 #include <fbs.h>
 #include <uri8.h>
 #include <pathinfo.h>
-#include <xml/dom/xmlengdom.h>
-#include <xml/dom/xmlengserializationoptions.h>
-#include <xml/dom/xmlengdomparser.h>
+#include <xmlengdom.h>
+#include <xmlengserializationoptions.h>
+#include <xmlengdomparser.h>
 #include <sysutil.h>
 #include <bautils.h>
 #include <caf/caf.h>
--- a/upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectorydb.cpp	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectorydb.cpp	Wed Sep 01 12:16:49 2010 +0100
@@ -20,7 +20,7 @@
 #include <barsread.h>
 #include <barsc.h>   
 #include <f32file.h>
-#include <xml/dom/xmlengdom.h>
+#include <xmlengdom.h>
 #include <sysutil.h>
 #include <upnpdominterface.h>
 #include <upnpstring.h>
--- a/upnpmediaserver/contentdirectoryservice/src/upnpelementbean.cpp	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/src/upnpelementbean.cpp	Wed Sep 01 12:16:49 2010 +0100
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include <xml/dom/xmlengdom.h>
+#include <xmlengdom.h>
 #include "upnpelementbean.h"
 #include "upnpcontentdirectoryglobals.h"
 #include "upnpcdutils.h"
--- a/upnpmediaserver/contentdirectoryservice/src/upnpelementfactory.cpp	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/src/upnpelementfactory.cpp	Wed Sep 01 12:16:49 2010 +0100
@@ -19,7 +19,7 @@
 // INCLUDE FILES
 #include <sysutil.h>
 #include <uri8.h>
-#include <xml/dom/xmlengdomparser.h>
+#include <xmlengdomparser.h>
 
 #include "upnpelementfactory.h"
 #include "upnpcontentdirectoryglobals.h"
--- a/upnpmediaserver/contentdirectoryservice/src/upnpxmlcontentfilter.cpp	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/src/upnpxmlcontentfilter.cpp	Wed Sep 01 12:16:49 2010 +0100
@@ -23,8 +23,8 @@
 
 #include <xml/parser.h>
 #include <xml/parserfeature.h>
-#include <xml/dom/xmlengnodefilter.h>
-#include <xml/dom/xmlengdomparser.h>
+#include <xmlengnodefilter.h>
+#include <xmlengdomparser.h>
 
 #include <charconv.h>
 #include <utf.h>
--- a/upnpmediaserver/group/bld.inf	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpmediaserver/group/bld.inf	Wed Sep 01 12:16:49 2010 +0100
@@ -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,6 +22,9 @@
 //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
 
@@ -30,7 +33,6 @@
 #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
--- a/upnpmediaserver/rom/bld.inf	Tue Aug 31 15:29:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/** @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	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpmpxplugins/group/bld.inf	Wed Sep 01 12:16:49 2010 +0100
@@ -15,18 +15,23 @@
 *
 */
 
+
+
+
+
+
 #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"
-
-// upnpmpxplugins ROM
-#include "../rom/bld.inf"
+    // playback plugins
+    #include "../upnpplaybackplugins/group/bld.inf"
 
 // end of file
--- a/upnpmpxplugins/rom/bld.inf	Tue Aug 31 15:29:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* 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	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpsettings/group/bld.inf	Wed Sep 01 12:16:49 2010 +0100
@@ -15,21 +15,28 @@
 *
 */
 
+
+
+
+
+
 // 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
-
-// settings engine
-#include "../upnpsettingsengine/group/bld.inf"
+// none
 
-// Exports for upnpsettings
-#include "../rom/bld.inf"
-
+    // settings engine
+    #include "../upnpsettingsengine/group/bld.inf"
 #ifdef FF_UPNP_FRAMEWORK_2_0  // UPnP feature flag
     // multiselectionui
     #include "../multiselectionui/group/bld.inf"
@@ -39,10 +46,8 @@
 
     // Sharing ui
     #include "../upnpsharingui/group/bld.inf"
-
+#endif // FF_UPNP_FRAMEWORK_2_0
     // GS plugin
     #include "../upnpgsplugin/group/bld.inf"
 
-#endif // FF_UPNP_FRAMEWORK_2_0
-
 // end of file
--- a/upnpsettings/rom/bld.inf	Tue Aug 31 15:29:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* 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/upnpsettings/upnpsettingsengine/group/upnpsettingsengine.mmp	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpsettings/upnpsettingsengine/group/upnpsettingsengine.mmp	Wed Sep 01 12:16:49 2010 +0100
@@ -62,6 +62,7 @@
 
 // Connection Manager, new APIs for getting IAPs, etc.
 LIBRARY cmmanager.lib
+LIBRARY apengine.lib 
 
 DEBUGLIBRARY flogger.lib
 
--- a/upnpsettings/upnpsettingsengine/src/upnpsettingsengine.cpp	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpsettings/upnpsettingsengine/src/upnpsettingsengine.cpp	Wed Sep 01 12:16:49 2010 +0100
@@ -29,6 +29,7 @@
 #include <pathinfo.h> //PathInfo
 #include <upnpmediaserversettings.h>
 
+#include <cmsettingsui.h> // CCmSettingsUi
 #include <cmmanager.h>   // RCmManager
 #include <cmconnectionmethoddef.h>
 #include <commdb.h> // CCommsDatabase
@@ -689,6 +690,10 @@
 //
 EXPORT_C void CUPnPSettingsEngine::CreateAccessPointL()
     {
+    CCmSettingsUi* settings = CCmSettingsUi::NewL();    
+    CleanupStack::PushL( settings );
+    settings->RunSettingsL();
+    CleanupStack::PopAndDestroy( settings );
     }
     
 //---------------------------------------------------------------------------
--- a/upnpsharing/group/bld.inf	Tue Aug 31 15:29:11 2010 +0300
+++ b/upnpsharing/group/bld.inf	Wed Sep 01 12:16:49 2010 +0100
@@ -15,28 +15,36 @@
 *
 */
 
+
+
+
+
+
 // 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"
-
-// upnp security
-#include "../upnpsecurity/group/bld.inf"
+    // The DLNA profiler
+    #include "../upnpdlnaprofiler/group/bld.inf"
 
-// content server and server client
-#include "../upnpcontentserver/group/bld.inf"
+    // upnp security
+    #include "../upnpsecurity/group/bld.inf"
 
-// content server API
-#include "../applicationengine/group/bld.inf"
+    // content server and server client
+    #include "../upnpcontentserver/group/bld.inf"
 
-// Exports for upnpsharing
-#include "../rom/bld.inf"
+    // content server API
+    #include "../applicationengine/group/bld.inf"
 
 // end of file
--- a/upnpsharing/rom/bld.inf	Tue Aug 31 15:29:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* 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