# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1271422543 -10800
# Node ID e84a4b44b2e8d8a02135dd5b6ec7ba475bcb4c4a
# Parent  f5a58ecadc664b1564c024ba62e7c7a55280a1b3
Revision: 201011
Kit: 201015

diff -r f5a58ecadc66 -r e84a4b44b2e8 group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/group/bld.inf	Fri Apr 16 15:55:43 2010 +0300
@@ -0,0 +1,29 @@
+/*
+* Copyright (c) 2001-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:  Build information for srvdiscovery
+*
+*/
+
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+
+PRJ_MMPFILES
+#include "../upnp/group/bld.inf"
+#include "../servicediscoveryandcontrol/pnp/group/bld.inf"
+
+
+PRJ_TESTMMPFILES
\ No newline at end of file
diff -r f5a58ecadc66 -r e84a4b44b2e8 layers.sysdef.xml
--- a/layers.sysdef.xml	Tue Feb 02 01:12:20 2010 +0200
+++ b/layers.sysdef.xml	Fri Apr 16 15:55:43 2010 +0300
@@ -1,13 +1,14 @@
-<?xml version="1.0"?><!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [  
- <!ENTITY layer_real_source_path "sf/mw/srvdiscovery" >
+<?xml version="1.0"?>
+<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
+  <!ENTITY layer_real_source_path "sf/mw/srvdiscovery" >
 ]>
-<SystemDefinition name="ossrv" schema="1.4.0">  
-<systemModel> 
-<!-- Common file for prebuild layers-->          
-<layer name="mw_layer">                        
-<module name="upnp">                             
-<unit name="upnp" unitID="mrtdo.upnp" bldFile="&layer_real_source_path;/upnp/group" mrp="" />
-</module>    
-</layer>        
-</systemModel>
+
+<SystemDefinition name="srvdiscovery" schema="1.4.0">
+  <systemModel>
+    <layer name="mw_layer">
+      <module name="srvdiscovery">
+        <unit unitID="netdo.srvdiscovery" mrp="" bldFile="&layer_real_source_path;/group" name="srvdiscovery" />
+      </module>
+    </layer>
+  </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r f5a58ecadc66 -r e84a4b44b2e8 package_definition.xml
--- a/package_definition.xml	Tue Feb 02 01:12:20 2010 +0200
+++ b/package_definition.xml	Fri Apr 16 15:55:43 2010 +0300
@@ -6,6 +6,14 @@
         <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">
+        <unit bldFile="upnp/upnpstack_plat/group"/>
+      </component>
+      <component id="upnpstack" name="UPnP Stack" introduced="^3" purpose="optional">
+        <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">
         <unit mrp="srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
diff -r f5a58ecadc66 -r e84a4b44b2e8 servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp
--- a/servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp	Tue Feb 02 01:12:20 2010 +0200
+++ b/servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp	Fri Apr 16 15:55:43 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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 f5a58ecadc66 -r e84a4b44b2e8 servicediscoveryandcontrol/pnp/test/upnp/Server/StringDictionary/upnpdeviceschema.st
--- a/servicediscoveryandcontrol/pnp/test/upnp/Server/StringDictionary/upnpdeviceschema.st	Tue Feb 02 01:12:20 2010 +0200
+++ b/servicediscoveryandcontrol/pnp/test/upnp/Server/StringDictionary/upnpdeviceschema.st	Fri Apr 16 15:55:43 2010 +0300
@@ -1,8 +1,8 @@
 #
-# Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r f5a58ecadc66 -r e84a4b44b2e8 servicediscoveryandcontrol/pnp/test/upnp/Server/StringDictionary/upnpserviceschema.st
--- a/servicediscoveryandcontrol/pnp/test/upnp/Server/StringDictionary/upnpserviceschema.st	Tue Feb 02 01:12:20 2010 +0200
+++ b/servicediscoveryandcontrol/pnp/test/upnp/Server/StringDictionary/upnpserviceschema.st	Fri Apr 16 15:55:43 2010 +0300
@@ -1,14 +1,14 @@
-#
-# Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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:
diff -r f5a58ecadc66 -r e84a4b44b2e8 servicediscoveryandcontrol/pnp/test/upnp/group/application-protocols_upnp.mrp
--- a/servicediscoveryandcontrol/pnp/test/upnp/group/application-protocols_upnp.mrp	Tue Feb 02 01:12:20 2010 +0200
+++ b/servicediscoveryandcontrol/pnp/test/upnp/group/application-protocols_upnp.mrp	Fri Apr 16 15:55:43 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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 f5a58ecadc66 -r e84a4b44b2e8 servicediscoveryandcontrol/pnp/test/upnp/unittests/upnpdescriptiontest/StringDictionary/testvendordeviceschema.st
--- a/servicediscoveryandcontrol/pnp/test/upnp/unittests/upnpdescriptiontest/StringDictionary/testvendordeviceschema.st	Tue Feb 02 01:12:20 2010 +0200
+++ b/servicediscoveryandcontrol/pnp/test/upnp/unittests/upnpdescriptiontest/StringDictionary/testvendordeviceschema.st	Fri Apr 16 15:55:43 2010 +0300
@@ -1,8 +1,8 @@
 #
-# Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r f5a58ecadc66 -r e84a4b44b2e8 servicediscoveryandcontrol/pnp/test/upnp/unittests/upnpdescriptiontest/StringDictionary/testvendorserviceschema.st
--- a/servicediscoveryandcontrol/pnp/test/upnp/unittests/upnpdescriptiontest/StringDictionary/testvendorserviceschema.st	Tue Feb 02 01:12:20 2010 +0200
+++ b/servicediscoveryandcontrol/pnp/test/upnp/unittests/upnpdescriptiontest/StringDictionary/testvendorserviceschema.st	Fri Apr 16 15:55:43 2010 +0300
@@ -1,8 +1,8 @@
 #
-# Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r f5a58ecadc66 -r e84a4b44b2e8 servicediscoveryandcontrol/pnp/test/upnp/upnpdescription/StringDictionary/upnpdescriptionschema.st
--- a/servicediscoveryandcontrol/pnp/test/upnp/upnpdescription/StringDictionary/upnpdescriptionschema.st	Tue Feb 02 01:12:20 2010 +0200
+++ b/servicediscoveryandcontrol/pnp/test/upnp/upnpdescription/StringDictionary/upnpdescriptionschema.st	Fri Apr 16 15:55:43 2010 +0300
@@ -1,14 +1,14 @@
-#
-# Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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:
diff -r f5a58ecadc66 -r e84a4b44b2e8 servicediscoveryandcontrol/pnp/test/upnp/upnputils/strings/UpnpStringConstants.st
--- a/servicediscoveryandcontrol/pnp/test/upnp/upnputils/strings/UpnpStringConstants.st	Tue Feb 02 01:12:20 2010 +0200
+++ b/servicediscoveryandcontrol/pnp/test/upnp/upnputils/strings/UpnpStringConstants.st	Fri Apr 16 15:55:43 2010 +0300
@@ -1,8 +1,8 @@
 #
-# Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r f5a58ecadc66 -r e84a4b44b2e8 srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp
--- a/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp	Tue Feb 02 01:12:20 2010 +0200
+++ b/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp	Fri Apr 16 15:55:43 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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 f5a58ecadc66 -r e84a4b44b2e8 upnp/upnpstack/controlpointbase/src/upnpcpbembeddeddevicedescription.cpp
--- a/upnp/upnpstack/controlpointbase/src/upnpcpbembeddeddevicedescription.cpp	Tue Feb 02 01:12:20 2010 +0200
+++ b/upnp/upnpstack/controlpointbase/src/upnpcpbembeddeddevicedescription.cpp	Fri Apr 16 15:55:43 2010 +0300
@@ -300,7 +300,6 @@
 				    {
 					iResult = KErrNotFound;
 				    }
-
                 }
             }
         else
diff -r f5a58ecadc66 -r e84a4b44b2e8 upnp/upnpstack/controlpointbase/src/upnpserviceinfo.cpp
--- a/upnp/upnpstack/controlpointbase/src/upnpserviceinfo.cpp	Tue Feb 02 01:12:20 2010 +0200
+++ b/upnp/upnpstack/controlpointbase/src/upnpserviceinfo.cpp	Fri Apr 16 15:55:43 2010 +0300
@@ -233,19 +233,19 @@
             {
             result = RUpnpGenaMessageFactory::SubscribeL(
                             subscribe, servAddress, aPath, timeoutBuf );
-           break;
+            break;
             }
         case EResubscription:
             {
             result = RUpnpGenaMessageFactory::ResubscribeL(
                             subscribe, servAddress, aPath, timeoutBuf );
-			break;
+            break;
             }
         case EUnSubscription:
             {
             result = RUpnpGenaMessageFactory::UnsubscribeL(
                             subscribe, servAddress, aPath);
-			break;
+            break;
             }
         default:
             {
@@ -253,16 +253,15 @@
             User::Leave(KErrArgument);
             break;
             }
+
         }
     if(result == NULL)
         {
         // To avoid Coverity FORWARD_NULL errors
         User::Leave(KErrArgument);
         }
-    
     result->SetType( aType );
     iSessionId = result->SessionId();
-
     return result;
     }
 
diff -r f5a58ecadc66 -r e84a4b44b2e8 upnp/upnpstack/dlnawebserver/src/upnphttpchunkparser.cpp
--- a/upnp/upnpstack/dlnawebserver/src/upnphttpchunkparser.cpp	Tue Feb 02 01:12:20 2010 +0200
+++ b/upnp/upnpstack/dlnawebserver/src/upnphttpchunkparser.cpp	Fri Apr 16 15:55:43 2010 +0300
@@ -107,6 +107,7 @@
             {
             case EUnknown:
                 iContext = EHeader;
+                break;
             case EHeader:
                 interrupt = ParseHeader(aBuffer,aPos);
                 break;
diff -r f5a58ecadc66 -r e84a4b44b2e8 upnp/upnpstack/dlnawebserver/src/upnphttpsession.cpp
--- a/upnp/upnpstack/dlnawebserver/src/upnphttpsession.cpp	Tue Feb 02 01:12:20 2010 +0200
+++ b/upnp/upnpstack/dlnawebserver/src/upnphttpsession.cpp	Fri Apr 16 15:55:43 2010 +0300
@@ -1445,7 +1445,7 @@
 
     CUpnpHttpHeader* hdr = List->First();
 
-	if(hdr != NULL)
+    if(hdr != NULL)
 	{
 		HBufC8* newHeader = NULL;
 		newHeader = HBufC8::NewLC( KTransferPending801().Length() );
@@ -1456,6 +1456,7 @@
 
 		CleanupStack::PopAndDestroy( newHeader );
 	}
+
     msg->SetOutFilenameL( *iOutFilename );
     CleanupStack::Pop( msg );
     NotifyUpperLayerLD( msg );
diff -r f5a58ecadc66 -r e84a4b44b2e8 upnp/upnpstack/serviceframework/src/upnpsoapmessagefactory.cpp
--- a/upnp/upnpstack/serviceframework/src/upnpsoapmessagefactory.cpp	Tue Feb 02 01:12:20 2010 +0200
+++ b/upnp/upnpstack/serviceframework/src/upnpsoapmessagefactory.cpp	Fri Apr 16 15:55:43 2010 +0300
@@ -217,7 +217,6 @@
     
     CUpnpHttpHeader* hdr = hdrList->First();
     
-    
     while ( hdr )
     {
      TBool flag = EFalse;