# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1279813411 -3600
# Node ID d893972633bcf404e6632cf9ac5c03ae099ed995
# Parent  7c5dc61114c138e2f3f388654f420ad7688ef24d# Parent  78fbd574edf49bde6d9abb7e4fc0e6b724d86921
Catchup to latest Symbian^4

diff -r 7c5dc61114c1 -r d893972633bc package_definition.xml
--- a/package_definition.xml	Thu Jun 17 22:32:09 2010 +0100
+++ b/package_definition.xml	Thu Jul 22 16:43:31 2010 +0100
@@ -2,20 +2,20 @@
 <SystemDefinition schema="3.0.0">
   <package id="srvdiscovery" name="Service Discovery and Usage" levels="plugin framework server generic specific">
     <collection id="servicediscoveryandcontrol" name="Service Discovery and Control" level="framework">
-      <component id="servicediscoveryfw" name="Service Discovery Framework" introduced="^3" purpose="optional">
+      <component id="servicediscoveryfw" name="Service Discovery Framework" introduced="^3" purpose="optional" filter="s60">
         <unit bldFile="servicediscoveryandcontrol/pnp/group" mrp="servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp"/>
       </component>
     </collection>
     <collection id="upnp" name="UPnP" level="server">
-      <component id="upnpstack_plat" name="UPnP Stack Platform Interfaces" introduced="^3" purpose="optional" class="api">
+      <component id="upnpstack_plat" name="UPnP Stack Platform Interfaces" introduced="^3" purpose="optional" class="api" filter="s60">
         <unit bldFile="upnp/upnpstack_plat/group"/>
       </component>
-      <component id="upnpstack" name="UPnP Stack" introduced="^3" purpose="optional">
+      <component id="upnpstack" name="UPnP Stack" introduced="^3" purpose="optional" filter="s60">
         <unit bldFile="upnp/upnpstack/group"/>
       </component>
     </collection>
     <collection id="srvdiscovery_info" name="Service Discovery and Usage Info" level="specific">
-      <component id="srvdiscovery_metadata" name="Service Discovery and Usage Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <component id="srvdiscovery_metadata" name="Service Discovery and Usage Metadata" class="config" introduced="^2" purpose="development" target="desktop" filter="s60">
         <unit mrp="srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
       </component>
     </collection>
diff -r 7c5dc61114c1 -r d893972633bc servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp
--- a/servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp	Thu Jun 17 22:32:09 2010 +0100
+++ b/servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp	Thu Jul 22 16:43:31 2010 +0100
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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: 
-#
-
 component	servicediscoveryframework
 source	\sf\mw\srvdiscovery\servicediscoveryandcontrol\pnp
 binary	\sf\mw\srvdiscovery\servicediscoveryandcontrol\pnp\group	all
diff -r 7c5dc61114c1 -r d893972633bc servicediscoveryandcontrol/pnp/test/upnp/group/application-protocols_upnp.mrp
--- a/servicediscoveryandcontrol/pnp/test/upnp/group/application-protocols_upnp.mrp	Thu Jun 17 22:32:09 2010 +0100
+++ b/servicediscoveryandcontrol/pnp/test/upnp/group/application-protocols_upnp.mrp	Thu Jul 22 16:43:31 2010 +0100
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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: 
-#
-
 component	application-protocols_upnp
 source	\sf\mw\srvdiscovery\servicediscoveryandcontrol\upnp
 binary	\sf\mw\srvdiscovery\servicediscoveryandcontrol\upnp\group	all
diff -r 7c5dc61114c1 -r d893972633bc srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp
--- a/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp	Thu Jun 17 22:32:09 2010 +0100
+++ b/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp	Thu Jul 22 16:43:31 2010 +0100
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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: 
-#
-
 component           srvdiscovery_metadata
 source   \sf\mw\srvdiscovery\srvdiscovery_info\srvdiscovery_metadata 
 source   \sf\mw\srvdiscovery\package_definition.xml
diff -r 7c5dc61114c1 -r d893972633bc upnp/upnpstack/serviceframework/src/upnpdeviceimplementation.cpp
--- a/upnp/upnpstack/serviceframework/src/upnpdeviceimplementation.cpp	Thu Jun 17 22:32:09 2010 +0100
+++ b/upnp/upnpstack/serviceframework/src/upnpdeviceimplementation.cpp	Thu Jul 22 16:43:31 2010 +0100
@@ -19,7 +19,7 @@
 // INCLUDE FILES
 
 #include <e32math.h>
-#include <xmlengdom.h> 
+#include <xml/dom/xmlengdom.h> 
 
 #include <upnpdevicedescriptionstore.h>
 #include "upnpfileutils.h"
diff -r 7c5dc61114c1 -r d893972633bc upnp/upnpstack/serviceframework/src/upnpdeviceimplementationbase.cpp
--- a/upnp/upnpstack/serviceframework/src/upnpdeviceimplementationbase.cpp	Thu Jun 17 22:32:09 2010 +0100
+++ b/upnp/upnpstack/serviceframework/src/upnpdeviceimplementationbase.cpp	Thu Jul 22 16:43:31 2010 +0100
@@ -19,7 +19,7 @@
 // INCLUDE FILES
 
 #include <e32math.h>
-#include <xmlengdom.h> 
+#include <xml/dom/xmlengdom.h> 
 
 #include "upnpfileutils.h"
 #include "upnpicon.h"
diff -r 7c5dc61114c1 -r d893972633bc upnp/upnpstack/serviceframework/src/upnpsilentdeviceimplementation.cpp
--- a/upnp/upnpstack/serviceframework/src/upnpsilentdeviceimplementation.cpp	Thu Jun 17 22:32:09 2010 +0100
+++ b/upnp/upnpstack/serviceframework/src/upnpsilentdeviceimplementation.cpp	Thu Jul 22 16:43:31 2010 +0100
@@ -19,7 +19,7 @@
 // INCLUDE FILES
 
 #include <e32math.h>
-#include <xmlengdom.h> 
+#include <xml/dom/xmlengdom.h> 
 
 #include <upnpdevicedescriptionstore.h>
 #include "upnpfileutils.h"
diff -r 7c5dc61114c1 -r d893972633bc upnp/upnpstack/upnputils/src/upnpdominterface.cpp
--- a/upnp/upnpstack/upnputils/src/upnpdominterface.cpp	Thu Jun 17 22:32:09 2010 +0100
+++ b/upnp/upnpstack/upnputils/src/upnpdominterface.cpp	Thu Jul 22 16:43:31 2010 +0100
@@ -30,9 +30,9 @@
 #include "upnpcustomlog.h"
 
 
-#include <xmlengdom.h>
-#include <xmlengdocument.h>
-#include <xmlengserializationoptions.h>
+#include <xml/dom/xmlengdom.h>
+#include <xml/dom/xmlengdocument.h>
+#include <xml/dom/xmlengserializationoptions.h>
 
 
 
diff -r 7c5dc61114c1 -r d893972633bc upnp/upnpstack_plat/upnp_device_api/inc/upnpdevicedescriptionstore.h
--- a/upnp/upnpstack_plat/upnp_device_api/inc/upnpdevicedescriptionstore.h	Thu Jun 17 22:32:09 2010 +0100
+++ b/upnp/upnpstack_plat/upnp_device_api/inc/upnpdevicedescriptionstore.h	Thu Jul 22 16:43:31 2010 +0100
@@ -20,9 +20,9 @@
 #define C_CUPNPDEVICEDESCRIPTIONSTORE_H
 
 #include <e32base.h> 
-#include <xmlengdom.h> 
-#include <xmlengdocument.h>
-#include <xmlengdomparser.h>
+#include <xml/dom/xmlengdom.h> 
+#include <xml/dom/xmlengdocument.h>
+#include <xml/dom/xmlengdomparser.h>
 #include <upnpicon.h>
 
 class CUpnpDevice;
diff -r 7c5dc61114c1 -r d893972633bc upnp/upnpstack_plat/upnp_utils_api/inc/upnpdominterface.h
--- a/upnp/upnpstack_plat/upnp_utils_api/inc/upnpdominterface.h	Thu Jun 17 22:32:09 2010 +0100
+++ b/upnp/upnpstack_plat/upnp_utils_api/inc/upnpdominterface.h	Thu Jul 22 16:43:31 2010 +0100
@@ -26,7 +26,7 @@
 #include <f32file.h>
 #include <s32file.h>
 #include <utf.h>
-#include <xmlengdom.h>
+#include <xml/dom/xmlengdom.h>
 
 namespace UpnpDomInterface
     {