Revision: 200941 PDK_3.0.d
authorMikko Sunikka <mikko.sunikka@nokia.com>
Fri, 06 Nov 2009 13:15:00 +0200
changeset 18 a758fa0cb043
parent 15 60c5402cb945
child 21 d8767d807da2
child 22 9a9a761f03f1
Revision: 200941 Kit: 200945
package_definition.xml
web_pub/favourites_engine_api/tsrc/inc/FavouritesEngineTest.h
web_pub/favourites_engine_api/tsrc/src/FavouritesEngineTest.cpp
web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestCases.cpp
web_pub/favourites_engine_api/tsrc/src/FavouritesWapApTestCases.cpp
webengine/osswebengine/WebCore/platform/symbian/OOMHandler.h
webengine/osswebengine/WebCore/platform/symbian/OOMStopper.h
webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.cpp
webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.h
webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.cpp
webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.h
webengine/osswebengine/WebKit/s60/webview/BrCtlSoftkeysObserverImpl.h
webengine/osswebengine/WebKit/s60/webview/BrCtlSpecialLoadObserverImpl.h
webengine/osswebengine/WebKit/s60/webview/BrCtlWindowObserverImpl.h
webengine/osswebengine/cache/cache_check.pl
webengine/osswebengine/cache/filter_emulator_output.bat
webengine/osswebengine/cache/filter_log.pl
webengine/widgetinstaller/Inc/WidgetBackupRegistryXml.h
webengine/widgetinstaller/Src/WidgetBackupRegistryXml.cpp
webengine/wrtharvester/inc/wrtusbhandler.h
webengine/wrtharvester/rom/wrtharvesterResources.iby
webengine/wrtharvester/src/wrtusbhandler.cpp
widgets/widgetapp/inc/WidgetUiNetworkListener.h
widgets/widgetapp/src/WidgetUiNetworkListener.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml	Fri Nov 06 13:15:00 2009 +0200
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="web" name="Web" levels="plugin utils server generic specific">
+    <collection id="web_info" name="Web Info" level="specific">
+      <component id="web_pub" filter="s60" name="Web Public Interfaces" class="api">
+        <unit bldFile="web_pub/group"/>
+        <!-- can these be #included in the above bld.inf?  --> 
+        <!-- <unit bldFile="web_pub/browser_control_api/tsrc/group"/> -->
+        <!-- <unit bldFile="web_pub/download_mgr_client_api/tsrc/group"/> -->
+        <!-- <unit bldFile="web_pub/favourites_engine_api/tsrc/group"/> -->
+      </component>
+      <component id="web_build" filter="s60" name="Web Build">
+      	<!-- if the #ifdef can be moved out of here, this can be removed -->
+        <unit bldFile="group"/>
+      </component>
+      <component id="web_plat" filter="s60" name="Web Platform Interfaces" class="api">
+        <unit bldFile="web_plat/group"/>
+      </component>
+    </collection>
+    <collection id="browserutilities" name="Browser Utilities" level="utils">
+      <component id="browserdialogsprovider" filter="s60" name="Browser Dialogs Provider">
+        <unit bldFile="browserutilities/browserdialogsprovider/group"/>
+      </component>
+      <component id="recenturlstore" filter="s60" name="Recent URL Store">
+        <unit bldFile="browserutilities/recenturlstore/group"/>
+      </component>
+      <component id="xmlparser" filter="s60" name="XML Interface">
+        <unit bldFile="browserutilities/xmlparser/group"/>
+      </component>
+      <component id="cxmllibrary" filter="s60" name="XML Parser Implementation">
+        <unit bldFile="browserutilities/cxmllibrary/group"/>
+      </component>
+      <component id="downloadmgr" filter="s60" name="Download Manager">
+        <unit bldFile="browserutilities/downloadmgr/group"/>
+      </component>
+      <component id="connectionmanager" filter="s60" name="Connection Manager">
+        <unit bldFile="browserutilities/connectionmanager/group"/>
+      </component>
+      <component id="browsertelservice" filter="s60" name="Browser Telephony Service">
+        <unit bldFile="browserutilities/browsertelservice/group"/>
+      </component>
+      <component id="favouritesengine" filter="s60" name="Favourites Engine">
+        <unit bldFile="browserutilities/favouritesengine/group"/>
+      </component>
+      <component id="feedsengine" filter="s60" name="Feeds Engine">
+        <unit bldFile="browserutilities/feedsengine/group"/>
+        	<!--  should this test be #included in the above bld.inf? -->
+        <!-- <unit bldFile="browserutilities/feedsengine/feedsserver/reconizer/group"/> -->
+      </component>
+      <component id="multipartparser" filter="s60" name="Multipart Parser">
+        <unit bldFile="browserutilities/multipartparser/group"/>
+      </component>
+      <component id="schemehandler" filter="s60" name="Scheme Handler">
+        <unit bldFile="browserutilities/schemehandler/group"/>
+      </component>
+      <component id="webutils" filter="s60" name="Web Utils">
+        <unit bldFile="browserutilities/webutils/group"/>
+        	<!--  should this test be #included in the above bld.inf? -->
+        <!-- <unit bldFile="browserutilities/webutils/tsrc/public/adv/group"/> -->
+      </component>
+      <component id="aiwbrowserprovider" filter="s60" name="AIW Browser Provider" class="plugin">
+        <unit bldFile="browserutilities/aiwbrowserprovider/group"/>
+      </component>
+      <component id="browserutilities_build" filter="s60" name="Browser Utilities Build">
+      	<!-- this can be removed if the #ifdef is moved into the multipart bld.inf -->
+        <unit bldFile="browserutilities/group"/>
+      </component>
+    </collection>
+    <collection id="webengine" name="Web Engine" level="server">
+      <component id="osswebengine" filter="s60" name="OSS Web Engine">
+      	<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
+        <unit bldFile="webengine/osswebengine/cache/group"/>
+        <unit bldFile="webengine/osswebengine/memorymanager/group"/>
+        <unit bldFile="webengine/osswebengine/npscript/group"/>
+        <unit bldFile="webengine/osswebengine/webkit/s60/group"/>
+        <unit bldFile="webengine/osswebengine/webkit/s60/group/javascriptcore"/>
+        <!-- <unit bldFile="webengine/osswebengine/webkit/s60/webview/webview_api_test/group"/> -->
+        <!-- <unit bldFile="webengine/osswebengine/webkit/s60/webview/webview_api_test/tsrc/group"/> -->
+      </component>
+      <component id="webkitutils" filter="s60" name="WebKit Utils">
+        <unit bldFile="webengine/webkitutils/group"/>
+      </component>
+      <component id="pagescaler" filter="s60" name="Page Scaler">
+        <unit bldFile="webengine/pagescaler/group"/>
+      </component>
+      <component id="webwidgetinstaller" filter="s60" name="Widget Installer">
+        <unit bldFile="webengine/widgetinstaller/group"/>
+      </component>
+      <component id="widgetregistry" filter="s60" name="Widget Registry">
+        <unit bldFile="webengine/widgetregistry/group"/>
+        	<!--  should this test be #included in the above bld.inf? -->
+        <!-- <unit bldFile="webengine/widgetregistry/tsrc/public/basic/group"/> -->
+      </component>
+      <component id="wmlengine" filter="s60" name="WML Engine">
+        <unit bldFile="webengine/wmlengine/group"/>
+      </component>
+      <component id="device" filter="s60" name="Device">
+     		<!-- this needs a more meaningful name -->
+        <unit bldFile="webengine/device/group"/>
+      </component>
+      <component id="widgetengine" filter="s60" name="Widget Engine">
+        <unit bldFile="webengine/widgetengine/group"/>
+      </component>
+      <!--Component manually removed as empty and name conflicts with another component-->
+      <component id="web_memoryplugin" name="Memory Plugin" filter="s60" class="plugin">
+       <unit bldFile="webengine/memoryplugin/group"/>
+     </component>
+      <component id="widgetmemoryplugin" filter="s60" name="Widget Memory Plugin" class="plugin">
+        <unit bldFile="webengine/widgetmemoryplugin/group"/>
+      </component>
+      <component id="widgetbackuprestore" filter="s60" name="Widget Backup and Restore">
+        <unit bldFile="webengine/widgetbackuprestore/group"/>
+      </component>
+      <component id="browserrecognizers" filter="s60" name="Browser Recognizers" class="plugin">
+        <unit bldFile="webengine/browserrecognizers/group"/>
+      </component>
+      <component id="wrtharvester" filter="s60" name="Web Runtime Harvester" class="plugin">
+        <unit bldFile="webengine/wrtharvester/group"/>
+      </component>
+      <component id="webengine_build" filter="s60" name="Web Engine Build">
+      	<!--  should be able to break this up into the above bld.infs  -->
+        <unit bldFile="webengine/group"/>
+      </component>
+    </collection>
+    <collection id="codhandler" name="Content Object Descriptor Handler" level="specific">
+      <component id="codeng" filter="s60" name="COD Engine">
+        <unit bldFile="codhandler/codeng/group"/>
+      </component>
+      <component id="codui" filter="s60" name="COD UI">
+        <unit bldFile="codhandler/codui/group"/>
+      </component>
+      <component id="codrecog" filter="s60" name="COD Recogniser" class="plugin">
+        <unit bldFile="codhandler/codrecog/group"/>
+      </component>
+      <component id="codviewer" filter="s60" name="COD Viewer">
+        <unit bldFile="codhandler/codviewer/group"/>
+      </component>
+      <component id="ddrecog" filter="s60" name="Download Descriptor Recogniser" class="plugin">
+        <unit bldFile="codhandler/ddrecog/group"/>
+      </component>
+      <component id="ddviewer" filter="s60" name="Download Descriptor Viewer">
+        <unit bldFile="codhandler/ddviewer/group"/>
+      </component>
+      <component id="coddownload" filter="s60" name="COD Download">
+        <unit bldFile="codhandler/coddownload/group"/>
+      </component>
+      <component id="roapapp" filter="s60" name="ROAP Application">
+        <unit bldFile="codhandler/roapapp/group"/>
+      </component>
+      <component id="codhandler_build" filter="s60" name="COD Handler Build">
+      	<!-- is there another component these exports can go into? -->
+        <unit bldFile="codhandler/group"/>
+      </component>
+    </collection>
+    <collection id="widgets" name="Web Widget Framework" level="generic">
+      <component id="widgetrecognizer" filter="s60" name="Widget Recognizer" class="plugin">
+        <unit bldFile="widgets/widgetrecognizer/group"/>
+      </component>
+      <component id="widgetinstaller" filter="s60" name="Widget Installer UI" class="plugin">
+        <unit bldFile="widgets/widgetinstaller/group"/>
+      </component>
+      <component id="widgetlauncher" filter="s60" name="Widget Launcher">
+        <unit bldFile="widgets/widgetlauncher/group"/>
+      </component>
+      <component id="widgetapp" filter="s60" name="Widget UI">
+        <unit bldFile="widgets/widgetapp/group"/>
+      </component>
+      <component id="widgetpreinstaller" filter="s60" name="Widget Pre-Installer">
+        <unit bldFile="widgets/widgetpreinstaller/group"/>
+      </component>
+      <component id="widgetstartup" filter="s60" name="Widget Startup">
+        <unit bldFile="widgets/widgetstartup/group"/>
+      </component>
+      <component id="widgets_build" filter="s60" name="Widgets Build">
+      	<!--  can this be broken up into the above components? -->
+        <unit bldFile="widgets/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- a/web_pub/favourites_engine_api/tsrc/inc/FavouritesEngineTest.h	Mon Oct 26 08:28:45 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/inc/FavouritesEngineTest.h	Fri Nov 06 13:15:00 2009 +0200
@@ -1,25 +1,22 @@
 /*
-* ==============================================================================
-*  Name        : FavouritesEngineTest.h
-*  Part of     : ?Subsystem_name / FavouritesEngineTest
-*
-*  Description : FavouritesEngineTest test module.
-*  Version:   0.5
+* Copyright (c) 2002 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*  Copyright (C) 2002 Nokia Corporation.
-*  This material, including documentation and any related 
-*  computer programs, is protected by copyright controlled by 
-*  Nokia Corporation. All rights are reserved. Copying, 
-*  including reproducing, storing,  adapting or translating, any 
-*  or all of this material requires the prior written consent of 
-*  Nokia Corporation. This material also contains confidential 
-*  information which may not be disclosed to others without the 
-*  prior written consent of Nokia Corporation.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-* ============================================================================
+* Description:  FavouritesEngineTest test module.
+*
 */
 
 
+
 #ifndef FAVOURITESENGINETEST_H
 #define FAVOURITESENGINETEST_H
 
--- a/web_pub/favourites_engine_api/tsrc/src/FavouritesEngineTest.cpp	Mon Oct 26 08:28:45 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesEngineTest.cpp	Fri Nov 06 13:15:00 2009 +0200
@@ -1,25 +1,22 @@
 /*
-* ==============================================================================
-*  Name        : FavouritesEngineTest.cpp
-*  Part of     : ?Subsystem_name / FavouritesEngineTest
-*
-*  Description : FavouritesBCTest class member functions
-*  Version:   0.5
+* Copyright (c) 2006 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*  Copyright (C) 2006 Nokia Corporation.
-*  This material, including documentation and any related 
-*  computer programs, is protected by copyright controlled by 
-*  Nokia Corporation. All rights are reserved. Copying, 
-*  including reproducing, storing,  adapting or translating, any 
-*  or all of this material requires the prior written consent of 
-*  Nokia Corporation. This material also contains confidential 
-*  information which may not be disclosed to others without the 
-*  prior written consent of Nokia Corporation.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-* ============================================================================
+* Description:  FavouritesBCTest class member functions
+*
 */
 
 
+
 // INCLUDE FILES
 #include <Stiftestinterface.h>
 #include "FavouritesEngineTest.h"
--- a/web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestCases.cpp	Mon Oct 26 08:28:45 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestCases.cpp	Fri Nov 06 13:15:00 2009 +0200
@@ -1,26 +1,23 @@
 /*
-* ============================================================================
-*  Name:      FavouritesItemTestCases.cpp
-*  Part of:   FavouritesEngineTest class member functions   
-*
-*  Description:
-*
-*  Version:   1.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 the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*  Copyright (C) 2008 Nokia Corporation.
-*  This material, including documentation and any related 
-*  computer programs, is protected by copyright controlled by 
-*  Nokia Corporation. All rights are reserved. Copying, 
-*  including reproducing, storing,  adapting or translating, any 
-*  or all of this material requires the prior written consent of 
-*  Nokia Corporation. This material also contains confidential 
-*  information which may not be disclosed to others without the 
-*  prior written consent of Nokia Corporation.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-* ============================================================================
+* Description: 
+*
+*
 */
 
 
+
 // INCLUDE FILES
 #include <e32math.h>
 #include "FavouritesEngineTest.h"
--- a/web_pub/favourites_engine_api/tsrc/src/FavouritesWapApTestCases.cpp	Mon Oct 26 08:28:45 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesWapApTestCases.cpp	Fri Nov 06 13:15:00 2009 +0200
@@ -1,26 +1,23 @@
 /*
-* ============================================================================
-*  Name:      FavouritesWapApTestCases.cpp
-*  Part of:   FavouritesEngineTest class member functions   
-*
-*  Description:
-*
-*  Version:   0.5
+* Copyright (c) 2002 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*  Copyright (C) 2002 Nokia Corporation.
-*  This material, including documentation and any related 
-*  computer programs, is protected by copyright controlled by 
-*  Nokia Corporation. All rights are reserved. Copying, 
-*  including reproducing, storing,  adapting or translating, any 
-*  or all of this material requires the prior written consent of 
-*  Nokia Corporation. This material also contains confidential 
-*  information which may not be disclosed to others without the 
-*  prior written consent of Nokia Corporation.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-* ============================================================================
+* Description: 
+*
+*
 */
 
 
+
 // INCLUDE FILES
 #include <e32math.h>
 #include "FavouritesEngineTest.h"
--- a/webengine/osswebengine/WebCore/platform/symbian/OOMHandler.h	Mon Oct 26 08:28:45 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/OOMHandler.h	Fri Nov 06 13:15:00 2009 +0200
@@ -1,45 +1,21 @@
 /*
-* ==============================================================================
-*  Name        : OOMHandler.h
-*  Part of     : Webcore / Platform
-*  Interface   :
-*  Description :
-*  Version     : %Version%
-*
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*
-*   Redistribution and use in source and binary forms, with or without
-*   modification, are permitted provided that the following conditions
-*   are met:
+* Copyright (c) 2006 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * Redistributions in binary form must reproduce the above copyright
-*        notice, this list of conditions and the following disclaimer in
-*        the documentation and/or other materials provided with the
-*        distribution.
-*      * Neither the name of the Nokia Corporation nor the names of its
-*        contributors may be used to endorse or promote products derived
-*        from this software without specific prior written permission.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-*   DAMAGE.
+* Description: 
 *
-*
-* ==============================================================================
 */
 
+
 #ifndef __OOMHANDLER_H__
 #define __OOMHANDLER_H__
 
--- a/webengine/osswebengine/WebCore/platform/symbian/OOMStopper.h	Mon Oct 26 08:28:45 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/OOMStopper.h	Fri Nov 06 13:15:00 2009 +0200
@@ -1,45 +1,21 @@
 /*
-* ==============================================================================
-*  Name        : OOMHandler.h
-*  Part of     : Webcore / Platform
-*  Interface   :
-*  Description :
-*  Version     : %Version%
-*
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*
-*   Redistribution and use in source and binary forms, with or without
-*   modification, are permitted provided that the following conditions
-*   are met:
+* Copyright (c) 2006 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * Redistributions in binary form must reproduce the above copyright
-*        notice, this list of conditions and the following disclaimer in
-*        the documentation and/or other materials provided with the
-*        distribution.
-*      * Neither the name of the Nokia Corporation nor the names of its
-*        contributors may be used to endorse or promote products derived
-*        from this software without specific prior written permission.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-*   DAMAGE.
+* Description: 
 *
-*
-* ==============================================================================
 */
 
+
 #ifndef __OOMSTOPPER_H__
 #define __OOMSTOPPER_H__
 
--- a/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.cpp	Mon Oct 26 08:28:45 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.cpp	Fri Nov 06 13:15:00 2009 +0200
@@ -1,38 +1,21 @@
 /*
-* ==============================================================================
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*
-*   Redistribution and use in source and binary forms, with or without
-*   modification, are permitted provided that the following conditions
-*   are met:
+* Copyright (c) 2006 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * Redistributions in binary form must reproduce the above copyright
-*        notice, this list of conditions and the following disclaimer in
-*        the documentation and/or other materials provided with the
-*        distribution.
-*      * Neither the name of the Nokia Corporation nor the names of its
-*        contributors may be used to endorse or promote products derived
-*        from this software without specific prior written permission.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-*   DAMAGE.
+* Description: 
 *
-* ==============================================================================
 */
 
+
 /*
  *  This class is a proxy for CAnimationDecoderWrapped
  *  
--- a/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.h	Mon Oct 26 08:28:45 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.h	Fri Nov 06 13:15:00 2009 +0200
@@ -1,38 +1,21 @@
 /*
-* ==============================================================================
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*
-*   Redistribution and use in source and binary forms, with or without
-*   modification, are permitted provided that the following conditions
-*   are met:
+* Copyright (c) 2006 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * Redistributions in binary form must reproduce the above copyright
-*        notice, this list of conditions and the following disclaimer in
-*        the documentation and/or other materials provided with the
-*        distribution.
-*      * Neither the name of the Nokia Corporation nor the names of its
-*        contributors may be used to endorse or promote products derived
-*        from this software without specific prior written permission.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-*   DAMAGE.
+* Description: 
 *
-* ==============================================================================
 */
 
+
 #ifndef ANIMATIONDECODER_H
 #define ANIMATIONDECODER_H
 
--- a/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.cpp	Mon Oct 26 08:28:45 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.cpp	Fri Nov 06 13:15:00 2009 +0200
@@ -1,38 +1,21 @@
 /*
-* ==============================================================================
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*
-*   Redistribution and use in source and binary forms, with or without
-*   modification, are permitted provided that the following conditions
-*   are met:
+* Copyright (c) 2006 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * Redistributions in binary form must reproduce the above copyright
-*        notice, this list of conditions and the following disclaimer in
-*        the documentation and/or other materials provided with the
-*        distribution.
-*      * Neither the name of the Nokia Corporation nor the names of its
-*        contributors may be used to endorse or promote products derived
-*        from this software without specific prior written permission.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-*   DAMAGE.
+* Description: 
 *
-* ==============================================================================
 */
 
+
 /*
  *  This class is wrapped by a proxy CAnimationDecoder
  *  
--- a/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.h	Mon Oct 26 08:28:45 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.h	Fri Nov 06 13:15:00 2009 +0200
@@ -1,38 +1,21 @@
 /*
-* ==============================================================================
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*
-*   Redistribution and use in source and binary forms, with or without
-*   modification, are permitted provided that the following conditions
-*   are met:
+* Copyright (c) 2006 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * Redistributions in binary form must reproduce the above copyright
-*        notice, this list of conditions and the following disclaimer in
-*        the documentation and/or other materials provided with the
-*        distribution.
-*      * Neither the name of the Nokia Corporation nor the names of its
-*        contributors may be used to endorse or promote products derived
-*        from this software without specific prior written permission.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-*   DAMAGE.
+* Description: 
 *
-* ==============================================================================
 */
 
+
 /*
  *  This class is wrapped by a proxy CAnimationDecoder
  *  
--- a/webengine/osswebengine/WebKit/s60/webview/BrCtlSoftkeysObserverImpl.h	Mon Oct 26 08:28:45 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/BrCtlSoftkeysObserverImpl.h	Fri Nov 06 13:15:00 2009 +0200
@@ -1,46 +1,22 @@
 /*
-* ==============================================================================
-*  Name        : BrCtlBrCtlSoftkeysObserverImpl.h
-*  Part of     : WebKit \ BrowserControl
-*  Interface   : Browser Control API
-*  Description : Handle softkeys updates
-*  Version     : %Version%
+* Copyright (c) 2006 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*  
-*  	Redistribution and use in source and binary forms, with or without
-*  	modification, are permitted provided that the following conditions
-*  	are met:
-*  
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * Redistributions in binary form must reproduce the above copyright
-*        notice, this list of conditions and the following disclaimer in
-*        the documentation and/or other materials provided with the
-*        distribution.
-*      * Neither the name of the Nokia Corporation nor the names of its
-*        contributors may be used to endorse or promote products derived
-*        from this software without specific prior written permission.
-*  
-*  	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*  	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-*  	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  	A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-*  	OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-*  	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-*  	LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  	DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  	THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-*  	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-*  	USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-*  	DAMAGE.
-*  
-*    Please see file patentlicense.txt for further grants.
-* ==============================================================================
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Handle softkeys updates
+*
 */
 
 
+
 #ifndef CRCTLSOFTKEYSOBSERVERIMPL_H
 #define CRCTLSOFTKEYSOBSERVERIMPL_H
 
--- a/webengine/osswebengine/WebKit/s60/webview/BrCtlSpecialLoadObserverImpl.h	Mon Oct 26 08:28:45 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/BrCtlSpecialLoadObserverImpl.h	Fri Nov 06 13:15:00 2009 +0200
@@ -1,46 +1,22 @@
 /*
-* ==============================================================================
-*  Name        : BrCtlSpecialLoadObserverImpl.h
-*  Part of     : WebKit \ BrowserControl
-*  Interface   : Browser Control API
-*  Description : Handle special load events such as network connection, deal with non-http or non-html requests
-*  Version     : %Version%
+* Copyright (c) 2006 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*  
-*  	Redistribution and use in source and binary forms, with or without
-*  	modification, are permitted provided that the following conditions
-*  	are met:
-*  
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * Redistributions in binary form must reproduce the above copyright
-*        notice, this list of conditions and the following disclaimer in
-*        the documentation and/or other materials provided with the
-*        distribution.
-*      * Neither the name of the Nokia Corporation nor the names of its
-*        contributors may be used to endorse or promote products derived
-*        from this software without specific prior written permission.
-*  
-*  	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*  	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-*  	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  	A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-*  	OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-*  	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-*  	LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  	DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  	THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-*  	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-*  	USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-*  	DAMAGE.
-*  
-*    Please see file patentlicense.txt for further grants.
-* ==============================================================================
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Handle special load events such as network connection, deal with non-http or non-html requests
+*
 */
 
 
+
 #ifndef BRCTLSPECIALLOADOBSERVERIMPL_H
 #define BRCTLSPECIALLOADOBSERVERIMPL_H
 
--- a/webengine/osswebengine/WebKit/s60/webview/BrCtlWindowObserverImpl.h	Mon Oct 26 08:28:45 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/BrCtlWindowObserverImpl.h	Fri Nov 06 13:15:00 2009 +0200
@@ -1,46 +1,22 @@
 /*
-* ==============================================================================
-*  Name        : BrCtlWinowObserverImpl.h
-*  Part of     : WebKit \ BrowserControl
-*  Interface   : Browser Control API
-*  Description : Handle special load events such as network connection, deal with non-http or non-html requests
-*  Version     : %Version%
+* Copyright (c) 2006 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*  
-*  	Redistribution and use in source and binary forms, with or without
-*  	modification, are permitted provided that the following conditions
-*  	are met:
-*  
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * Redistributions in binary form must reproduce the above copyright
-*        notice, this list of conditions and the following disclaimer in
-*        the documentation and/or other materials provided with the
-*        distribution.
-*      * Neither the name of the Nokia Corporation nor the names of its
-*        contributors may be used to endorse or promote products derived
-*        from this software without specific prior written permission.
-*  
-*  	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*  	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-*  	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  	A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-*  	OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-*  	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-*  	LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  	DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  	THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-*  	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-*  	USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-*  	DAMAGE.
-*  
-*    Please see file patentlicense.txt for further grants.
-* ==============================================================================
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Handle special load events such as network connection, deal with non-http or non-html requests
+*
 */
 
 
+
 #ifndef BRCTLWINDOWOBSERVERIMPL_H
 #define BRCTLWINDOWOBSERVERIMPL_H
 
--- a/webengine/osswebengine/cache/cache_check.pl	Mon Oct 26 08:28:45 2009 +0200
+++ b/webengine/osswebengine/cache/cache_check.pl	Fri Nov 06 13:15:00 2009 +0200
@@ -1,3 +1,18 @@
+#
+# 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 the License "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: 
+#
 #!/usr/bin/perl
 
 #use Encode;
--- a/webengine/osswebengine/cache/filter_emulator_output.bat	Mon Oct 26 08:28:45 2009 +0200
+++ b/webengine/osswebengine/cache/filter_emulator_output.bat	Fri Nov 06 13:15:00 2009 +0200
@@ -1,2 +1,18 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description: 
+@rem
+
 filter_log.pl %tmp%\epocwind.out log.txt"
 log.txt
--- a/webengine/osswebengine/cache/filter_log.pl	Mon Oct 26 08:28:45 2009 +0200
+++ b/webengine/osswebengine/cache/filter_log.pl	Fri Nov 06 13:15:00 2009 +0200
@@ -1,3 +1,18 @@
+#
+# 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 the License "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: 
+#
 #!/usr/bin/perl
 
 open INH,"<",$ARGV[0];
--- a/webengine/widgetinstaller/Inc/WidgetBackupRegistryXml.h	Mon Oct 26 08:28:45 2009 +0200
+++ b/webengine/widgetinstaller/Inc/WidgetBackupRegistryXml.h	Fri Nov 06 13:15:00 2009 +0200
@@ -1,25 +1,23 @@
 /*
-* ==============================================================================
-*  Name        : WidgetRegistryXml.h
-*  Part of     : Widget Registry
-*  Interface   : Widget Registry API
-*  Description : This file contains the header file of the CWidgetBackupRegistryXml class.
+* 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 the License "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:  This file contains the header file of the CWidgetBackupRegistryXml class.
 *
 *                This class processes persistent registry data in XML.
-*  Version     : %version: 7 %
 *
-*  Copyright © 2008 Nokia Corporation.
-*  This material, including documentation and any related
-*  computer programs, is protected by copyright controlled by
-*  Nokia Corporation. All rights are reserved. Copying,
-*  including reproducing, storing, adapting or translating, any
-*  or all of this material requires the prior written consent of
-*  Nokia Corporation. This material also contains confidential
-*  information which may not be disclosed to others without the
-*  prior written consent of Nokia Corporation.
-* ==============================================================================
 */
 
+
 #ifndef WIDGETBACKUPREGISTRYXML_H
 #define WIDGETBACKUPREGISTRYXML_H
 
--- a/webengine/widgetinstaller/Src/WidgetBackupRegistryXml.cpp	Mon Oct 26 08:28:45 2009 +0200
+++ b/webengine/widgetinstaller/Src/WidgetBackupRegistryXml.cpp	Fri Nov 06 13:15:00 2009 +0200
@@ -1,24 +1,20 @@
-//
-// ==============================================================================
-//  Name        : WidgetBackupRegistryXml.cpp
-//  Part of     : WidgetRegistry
-//  Interface   :
-//  Description : Processes registry persistent data in XML.
-//  Version     : 5.0
-//
-//  Copyright © 2008 Nokia Corporation.
-//  This material, including documentation and any related
-//  computer programs, is protected by copyright controlled by
-//  Nokia Corporation. All rights are reserved. Copying,
-//  including reproducing, storing, adapting or translating, any
-//  or all of this material requires the prior written consent of
-//  Nokia Corporation. This material also contains confidential
-//  information which may not be disclosed to others without the
-//  prior written consent of Nokia Corporation.
-// ==============================================================================
-///
+/*
+* 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 the License "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:  Processes registry persistent data in XML.
+*
+*/
 
-// INCLUDE FILES
 
 #include <e32base.h>
 #include <f32file.h>
--- a/webengine/wrtharvester/inc/wrtusbhandler.h	Mon Oct 26 08:28:45 2009 +0200
+++ b/webengine/wrtharvester/inc/wrtusbhandler.h	Fri Nov 06 13:15:00 2009 +0200
@@ -1,22 +1,21 @@
 /*
-* ============================================================================
-*  Name        : WidgetMMCHandler.h
-*  Part of     : Widget Registry
-*  Description : Acts on MMC card insertion/removal
-*  Version     : 3.1
+* 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 the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*  Copyright © 2008 Nokia Corporation.
-*  This material, including documentation and any related
-*  computer programs, is protected by copyright controlled by
-*  Nokia Corporation. All rights are reserved. Copying,
-*  including reproducing, storing, adapting or translating, any
-*  or all of this material requires the prior written consent of
-*  Nokia Corporation. This material also contains confidential
-*  information which may not be disclosed to others without the
-*  prior written consent of Nokia Corporation.
-* =============================================================================
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Acts on MMC card insertion/removal
+*
 */
 
+
 #ifndef WIDGETMMCHANDLER_H
 #define WIDGETMMCHANDLER_H
 
--- a/webengine/wrtharvester/rom/wrtharvesterResources.iby	Mon Oct 26 08:28:45 2009 +0200
+++ b/webengine/wrtharvester/rom/wrtharvesterResources.iby	Fri Nov 06 13:15:00 2009 +0200
@@ -1,22 +1,22 @@
 /*
-* =============================================================================
-*  Name        : wrtharvesterResources.iby
-*  Part of     :  
-*  Description : The resource iby file contains resource that needs to be  
-*                localized for wrtharvester
-*  Version     : %version: 1 % 
+* 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 the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*  Copyright (c) 2009 Nokia.  All rights reserved.
-*  This material, including documentation and any related computer
-*  programs, is protected by copyright controlled by Nokia.  All
-*  rights are reserved.  Copying, including reproducing, storing,
-*  adapting or translating, any or all of this material requires the
-*  prior written consent of Nokia.  This material also contains
-*  confidential information which may not be disclosed to others
-*  without the prior written consent of Nokia.
-* ============================================================================
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  The resource iby file contains resource that needs to be  
+*                localized for wrtharvester
+*
 */
 
+
 #ifndef WRTHARVESTERRESOURCES_IBY
 #define WRTHARVESTERRESOURCES_IBY
 
--- a/webengine/wrtharvester/src/wrtusbhandler.cpp	Mon Oct 26 08:28:45 2009 +0200
+++ b/webengine/wrtharvester/src/wrtusbhandler.cpp	Fri Nov 06 13:15:00 2009 +0200
@@ -1,26 +1,22 @@
-//
-// ============================================================================
-//  Name     : WidgetMMCHandler.cpp
-//  Part of  : SW Installer UIs / WidgetInstallerUI
-//
-//  Description: Handle notifications of MMC events.
-//
-//
-//  Version     : 3.1
-//
-//  Copyright © 2006 Nokia Corporation.
-//  This material, including documentation and any related
-//  computer programs, is protected by copyright controlled by
-//  Nokia Corporation. All rights are reserved. Copying,
-//  including reproducing, storing, adapting or translating, any
-//  or all of this material requires the prior written consent of
-//  Nokia Corporation. This material also contains confidential
-//  information which may not be disclosed to others without the
-//  prior written consent of Nokia Corporation.
-// ==============================================================================
-///
+/*
+* Copyright (c) 2006 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"
+* 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:  Handle notifications of MMC events.
+*
+*
+*
+*/
 
-// INCLUDE FILES
 #include "wrtusbhandler.h"
 #include "wrtharvester.h"
 #include "wrtusbhandler.h"
--- a/widgets/widgetapp/inc/WidgetUiNetworkListener.h	Mon Oct 26 08:28:45 2009 +0200
+++ b/widgets/widgetapp/inc/WidgetUiNetworkListener.h	Fri Nov 06 13:15:00 2009 +0200
@@ -1,22 +1,20 @@
-//
-//==============================================================================
-// Name        : WidgetUiNetworkListener.h
-// Part of     : WidgetUI
-// Interface   :
-// Description :
-// Version      : %version: 5 %
-//
-// Copyright  2008, 2009 Nokia Corporation.
-// This material, including documentation and any related
-// computer programs, is protected by copyright controlled by
-// Nokia Corporation. All rights are reserved. Copying,
-// including reproducing, storing, adapting or translating, any
-// or all of this material requires the prior written consent of
-// Nokia Corporation. This material also contains confidential
-// information which may not be disclosed to others without the
-// prior written consent of Nokia Corporation.
-//==============================================================================
-//
+/*
+* 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"
+* 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: 
+*
+*/
+
 
 #ifndef WIDGETUINETWORKLISTENER_H_
 #define WIDGETUINETWORKLISTENER_H_
--- a/widgets/widgetapp/src/WidgetUiNetworkListener.cpp	Mon Oct 26 08:28:45 2009 +0200
+++ b/widgets/widgetapp/src/WidgetUiNetworkListener.cpp	Fri Nov 06 13:15:00 2009 +0200
@@ -1,22 +1,20 @@
-//
-//==============================================================================
-// Name        : WidgetUiNetworkListener.cpp
-// Part of     : WidgetUI
-// Interface   :
-// Description :
-// Version      : %version: 5 %
-//
-// Copyright  2008, 2009 Nokia Corporation.
-// This material, including documentation and any related
-// computer programs, is protected by copyright controlled by
-// Nokia Corporation. All rights are reserved. Copying,
-// including reproducing, storing, adapting or translating, any
-// or all of this material requires the prior written consent of
-// Nokia Corporation. This material also contains confidential
-// information which may not be disclosed to others without the
-// prior written consent of Nokia Corporation.
-//==============================================================================
-//
+/*
+* 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"
+* 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: 
+*
+*/
+
 
 #include "WidgetUiNetworkListener.h"