--- a/appinstall_plat/appmngr2runtimeapi/inc/appmngr2infobase.h	Thu Jan 07 12:52:45 2010 +0200
+++ b/appinstall_plat/appmngr2runtimeapi/inc/appmngr2infobase.h	Mon Jan 18 20:28:24 2010 +0200
@@ -358,13 +358,10 @@
      * or installation files list, or it may be displayed in separate
      * list of highlighted items.
      * 
-     * For example, untrusted installed applications can be highlighted.
-     * 
-     * 
-     * The
-     * item should indicate the reason why it is not displayed normally
-     * when iShowOnTop is set to ETrue (e.g. use special icon).
-     * See also the IsShowOnTop() function defined above.
+     * For example, new or untrusted installed applications can be highlighted.
+     * When set, the item needs to show the reason why iShowOnTop is enabled
+     * (e.g. by using "new" or "untrusted" icon). See also the IsShowOnTop()
+     * function defined above.
      */
     TBool iShowOnTop;
 

--- a/appinstaller/AppinstUi/Server/Src/SWInstAppUi.cpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/appinstaller/AppinstUi/Server/Src/SWInstAppUi.cpp	Mon Jan 18 20:28:24 2010 +0200
@@ -49,7 +49,7 @@
 void CSWInstAppUi::ConstructL()
     {
     BaseConstructL( EStandardApp | ENoScreenFurniture | ENonStandardResourceFile
-            | EAknEnableSkin | EAknEnableMSK );
+            | EAknEnableSkin | EAknEnableMSK | EAknSingleClickCompatible );
 
     // Create private path for the process
     iEikonEnv->FsSession().CreatePrivatePath( EDriveC );

--- a/iaupdate/IAD/engine/controller/src/iaupdatebasenodeimpl.cpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/iaupdate/IAD/engine/controller/src/iaupdatebasenodeimpl.cpp	Mon Jan 18 20:28:24 2010 +0200
@@ -439,7 +439,7 @@
             && aNode.MetaId() == MetaId()
          || ( aNode.Uid() == Uid()
             && aNode.Version() == Version() 
-            && aNode.iMime->Match( IAUpdateProtocolConsts::KMimeServicePackPattern()) == KErrNotFound ) ) //MTA: Changed!!!!!
+            && aNode.iMime->Match( IAUpdateProtocolConsts::KMimeServicePackPattern()) == KErrNotFound ) ) 
         {
         return ETrue;
         }

--- a/iaupdate/IAD/engine/controller/src/iaupdatenodecontainer.cpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/iaupdate/IAD/engine/controller/src/iaupdatenodecontainer.cpp	Mon Jan 18 20:28:24 2010 +0200
@@ -666,7 +666,7 @@
         for ( TInt i = 0; i < iHeadNodes.Count(); ++i )
             {
             CIAUpdateNode& tmpNode( *iHeadNodes[ i ] );            
-            if( aNode.Uid() == tmpNode.Uid() && aNode.Type() != MIAUpdateNode::EPackageTypeServicePack ) //MTA: Changed!!!
+            if( aNode.Uid() == tmpNode.Uid() && aNode.Type() != MIAUpdateNode::EPackageTypeServicePack ) 
                 {
                 IAUPDATE_TRACE("[IAUPDATE] Head node already in the list.");
                 

--- a/iaupdate/IAD/ui/src/iaupdateappui.cpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/iaupdate/IAD/ui/src/iaupdateappui.cpp	Mon Jan 18 20:28:24 2010 +0200
@@ -325,10 +325,7 @@
         case EIAUpdateCmdStartUpdate:
             {
             IAUPDATE_TRACE("[IAUPDATE] CIAUpdateAppUi::HandleCommandL() EIAUpdateCmdStartUpdate");
-
-            // No need to be totally silent since the updating is started
-            // by user.
-            SetDefaultConnectionMethodL( EFalse );
+    
 
             // by pushing object to cleanup stack it's destructor is called if leave happens
             // so global lock issued by this instance can be released in destructor of CIAUpdateGlobalLockHandler
@@ -336,6 +333,9 @@
             if ( !globalLockHandler->InUseByAnotherInstanceL() )
                 {
             	globalLockHandler->SetToInUseForAnotherInstancesL( ETrue );
+            	// No need to be totally silent since the updating is started
+            	// by user.
+            	SetDefaultConnectionMethodL( EFalse );
             	iController->StartUpdateL();
             	CleanupStack::Pop( globalLockHandler );	
             	delete iGlobalLockHandler;
@@ -578,54 +578,38 @@
 void CIAUpdateAppUi::StartupCompleteL()
     {
     IAUPDATE_TRACE("[IAUPDATE] CIAUpdateAppUi::StartupCompleteL() begin"); 
-    TBool totalSilent( EFalse );
-    if ( iRequestType == IAUpdateUiDefines::ECheckUpdates )
-        {
-        if ( iController->Filter() )
-            {
-        	if ( iController->Filter()->FilterParams() )
-        	    {
-        	    if ( iController->Filter()->FilterParams()->Refresh() )
-        	        {
-        	    	//from bgchecker, make it silent
-                    totalSilent = ETrue;
-        	        }
-           	    }
-            }
-        }
     
-    TRAPD( err, SetDefaultConnectionMethodL( totalSilent ) );
-    
-    if ( err != KErrNone )
-        {
-        IAUPDATE_TRACE("[IAUPDATE] CIAUpdateAppUi::StartupCompleteL() IAP selection failed!!"); 
-        //can't find usable IAP on the phone, complete the request
-        //If background checker is the client, it will try again after 1 month
-        if ( totalSilent )
-            {
-            //from bgchecker, report the error to so background checker will start retry mode
-            RefreshCompleteL( EFalse, err );
-            }
-        else
-            {
-            //report it to the API caller or to main view
-            RefreshCompleteL( ETrue, err );
-            }
-        return;
-        }
-       
     delete iGlobalLockHandler;
     iGlobalLockHandler = NULL;
     iGlobalLockHandler = CIAUpdateGlobalLockHandler::NewL();
     if ( !iGlobalLockHandler->InUseByAnotherInstanceL() )
         {
+        TBool totalSilent( EFalse );
+        if ( iRequestType == IAUpdateUiDefines::ECheckUpdates )
+            {
+            if ( iController->Filter() )
+                {
+                if ( iController->Filter()->FilterParams() )
+                    {
+                    if ( iController->Filter()->FilterParams()->Refresh() )
+                        {
+                        //from bgchecker, make it silent
+                        totalSilent = ETrue;
+                        }
+                    }
+                }
+            }
+        SetDefaultConnectionMethodL( totalSilent );
         iGlobalLockHandler->SetToInUseForAnotherInstancesL( ETrue );
-        iController->StartRefreshL();	
+        iController->StartRefreshL();  
         }
     else
         {
         RefreshCompleteL( ETrue, KErrServerBusy );
         }    
+ 
+       
+    
     IAUPDATE_TRACE("[IAUPDATE] CIAUpdateAppUi::StartupCompleteL() end");    
     }
     
@@ -694,16 +678,6 @@
         }
     else 
         {    
-        /*if ( ( iController->TestRole() ) && 
-             ( !iStartedFromApplication ) && 
-             ( aWithViewActivation  ) )
-            {
-    	    for( TInt i = 0; i < iController->Nodes().Count(); ++i )
-                {
-                MIAUpdateNode* node = iController->Nodes()[i];
-                node->Base().SetSelected( EFalse ); 
-                }
-            }*/    
         RefreshL( aError );   
         if ( aWithViewActivation)
             {

--- a/iaupdate/IAD/ui/src/iaupdatehistorycontainer.cpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/iaupdate/IAD/ui/src/iaupdatehistorycontainer.cpp	Mon Jan 18 20:28:24 2010 +0200
@@ -234,71 +234,30 @@
             // error situations.
             iconIndex = 1;
             }
-        
         HBufC* nodeStateDescription = NodeStateDescriptionLC( *item );
         TPtr ptr = nodeStateDescription->Des();
         AknTextUtils::DisplayTextLanguageSpecificNumberConversion( ptr ); 
-        
-
-        HBufC* nameAndVersion = NULL;
-        
-        _LIT( KZeroVersion, "0.00(0)");
-        
-        //If version number is all zeros, then only show name of the package
-        //This checking is meant for service pack which doesn't have any version number
-
-        if ( item->Version().Compare( KZeroVersion ) == 0 )
-            {
-            nameAndVersion = item->Name().AllocLC();
-            }
-        else
-            {
-            CDesCArray* stringArray = new ( ELeave ) CDesCArrayFlat( 1 );  
-            CleanupStack::PushL( stringArray );  
-            stringArray->AppendL( item->Name() );  
-            CArrayFix<TInt>* numberArray = new ( ELeave ) CArrayFixFlat<TInt>( 2 );
-            CleanupStack::PushL( numberArray );
-            TInt8 majorVersion( 0 );
-            TInt8 minorVersion( 0 );
-            TInt16 buildVersion( 0 );
-            IAUpdateUtils::DesToVersionL( item->Version(), 
-                                      majorVersion, minorVersion, buildVersion );
-                                             
-            numberArray->AppendL( majorVersion ); 
-            numberArray->AppendL( minorVersion );  
-                
-            nameAndVersion = StringLoader::LoadL( R_IAUPDATE_NAME_WITH_VERSION, 
-                                                      *stringArray, 
-                                                      *numberArray );
-            CleanupStack::PopAndDestroy( numberArray );
-            CleanupStack::PopAndDestroy( stringArray );
-
-            CleanupStack::PushL( nameAndVersion );
-            }
-
-        
-        TPtr nameAndVersionPtr = nameAndVersion->Des();
-        AknTextUtils::DisplayTextLanguageSpecificNumberConversion( nameAndVersionPtr );  
-        
+ 
+        HBufC* name = item->Name().AllocLC();
         TBuf<iconIndexLength> iconIndexBuf;
         iconIndexBuf.Format( KIconIndexFormat, iconIndex );
 
         HBufC* buffer = HBufC::NewLC( iconIndexBuf.Length() +
                                       KTabulator.iTypeLength + 
-                                      nameAndVersion->Length() + 
+                                      name->Length() + 
                                       KTabulator.iTypeLength +
                                       nodeStateDescription->Length() );  
 
         buffer->Des() = iconIndexBuf;
         buffer->Des() += KTabulator();
-        buffer->Des() += *nameAndVersion;
+        buffer->Des() += *name;
         buffer->Des() += KTabulator();
         buffer->Des() += *nodeStateDescription;        
          
         iItemTextArray->AppendL( *buffer );
                  
         CleanupStack::PopAndDestroy( buffer );
-        CleanupStack::PopAndDestroy( nameAndVersion );
+        CleanupStack::PopAndDestroy( name );
         CleanupStack::PopAndDestroy( nodeStateDescription );
         }    
     

--- a/iaupdate/IAD/ui/src/iaupdateinstallationlistener.cpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/iaupdate/IAD/ui/src/iaupdateinstallationlistener.cpp	Mon Jan 18 20:28:24 2010 +0200
@@ -159,9 +159,9 @@
 // 
 // -----------------------------------------------------------------------------
 //
-TInt CIAUpdateInstallationListener::RunError( TInt aError )
+TInt CIAUpdateInstallationListener::RunError( TInt /*aError*/ )
     {
-	IAUPDATE_TRACE_1("[IAUPDATE] CIAUpdateInstallationListener::RunError() error id: %d", aError );
+	IAUPDATE_TRACE("[IAUPDATE] CIAUpdateInstallationListener::RunError()");
 	return KErrNone;
     }
     

--- a/iaupdate/IAD/ui/src/iaupdatemaincontainer.cpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/iaupdate/IAD/ui/src/iaupdatemaincontainer.cpp	Mon Jan 18 20:28:24 2010 +0200
@@ -409,58 +409,22 @@
         
         if ( node->NodeType() == MIAUpdateAnyNode::ENodeTypeNormal )  
             {       
-
-            MIAUpdateNode* normalnode = static_cast<MIAUpdateNode*>( node );
-
-            HBufC* nameAndVersion = NULL;
-
-            if ( normalnode->Type() == MIAUpdateNode::EPackageTypeServicePack )
-                {
-                nameAndVersion = node->Base().Name().AllocLC();
-                }
-            else
-                {
-                CDesCArray* stringArray = new ( ELeave ) CDesCArrayFlat( 1 );  
-                CleanupStack::PushL( stringArray );  
-            
-                stringArray->AppendL( node->Base().Name() );  
-            
-                CArrayFixFlat<TInt>* numberArray = new ( ELeave ) CArrayFixFlat<TInt>( 2 );
-                CleanupStack::PushL( numberArray );
-            
-                numberArray->AppendL( node->Base().Version().iMajor ); 
-                numberArray->AppendL( node->Base().Version().iMinor );  
-              
-                    
-                nameAndVersion = StringLoader::LoadL( R_IAUPDATE_NAME_WITH_VERSION, 
-                                                          *stringArray, 
-                                                          *numberArray );
-
-                CleanupStack::PopAndDestroy( numberArray );
-                CleanupStack::PopAndDestroy( stringArray );
-                
-                CleanupStack::PushL( nameAndVersion ); 
-                }
-
-            
-            TPtr nameAndVersionPtr = nameAndVersion->Des();
-            AknTextUtils::DisplayTextLanguageSpecificNumberConversion( nameAndVersionPtr );
-            
+            HBufC* name = node->Base().Name().AllocLC();
             HBufC* buffer = HBufC::NewLC( KOne.iTypeLength +
                                           KTabulator.iTypeLength + 
-                                          nameAndVersion->Length() + 
+                                          name->Length() + 
                                           KTabulator.iTypeLength +
                                           importanceDescription->Length() );
             buffer->Des() = KOne();
             buffer->Des() += KTabulator();
-            buffer->Des() += *nameAndVersion;
+            buffer->Des() += *name;
             buffer->Des() += KTabulator();
             buffer->Des() += *importanceDescription;        
             
             iItemTextArray->AppendL( *buffer );
             
             CleanupStack::PopAndDestroy( buffer );
-            CleanupStack::PopAndDestroy( nameAndVersion );
+            CleanupStack::PopAndDestroy( name );
             }
 
         
@@ -494,9 +458,6 @@
             CleanupStack::PopAndDestroy( buffer );
             CleanupStack::PopAndDestroy( firmwarename );
             }
-
-        
-
         
         CleanupStack::PopAndDestroy( importanceDescription );
         }    

--- a/iaupdate/IAD/ui/src/iaupdaterefreshhandler.cpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/iaupdate/IAD/ui/src/iaupdaterefreshhandler.cpp	Mon Jan 18 20:28:24 2010 +0200
@@ -202,9 +202,9 @@
 // 
 // -----------------------------------------------------------------------------
 //
-TInt CIAUpdateRefreshHandler::RunError( TInt aError )
+TInt CIAUpdateRefreshHandler::RunError( TInt /*aError*/ )
     {
-	IAUPDATE_TRACE_1("[IAUPDATE] CIAUpdateRefreshHandler::RunError() error id: %d", aError );
+	IAUPDATE_TRACE("[IAUPDATE] CIAUpdateRefreshHandler::RunError()");
 	return KErrNone;
     }
     

Binary file iaupdate/rom/iaupdate_stub.SIS has changed

--- a/iaupdate/rom/iaupdate_stub.pkg	Thu Jan 07 12:52:45 2010 +0200
+++ b/iaupdate/rom/iaupdate_stub.pkg	Mon Jan 18 20:28:24 2010 +0200
@@ -16,7 +16,7 @@
 &EN
 
 ;Header 
-#{"Application update"}, (0x2000f85a), 2, 0, 8, TYPE=SA
+#{"Software update"}, (0x2000f85a), 2, 0, 8, TYPE=SA
 
 ;Localised Vendor Name
 %{"Nokia"}

Binary file iaupdate/rom/iaupdater_stub.SIS has changed

--- a/iaupdate/rom/iaupdater_stub.pkg	Thu Jan 07 12:52:45 2010 +0200
+++ b/iaupdate/rom/iaupdater_stub.pkg	Mon Jan 18 20:28:24 2010 +0200
@@ -16,7 +16,7 @@
 &EN
 
 ;Header 
-#{"Application updater"}, (0x2000f85d), 1, 0, 2, TYPE=SA
+#{"Software updater"}, (0x2000f85d), 1, 0, 2, TYPE=SA
 
 ;Localised Vendor Name
 %{"Nokia"}

Binary file iaupdateapi_stub/sis/iaupdate_stub.SIS has changed

--- a/iaupdateapi_stub/sis/iaupdate_stub.pkg	Thu Jan 07 12:52:45 2010 +0200
+++ b/iaupdateapi_stub/sis/iaupdate_stub.pkg	Mon Jan 18 20:28:24 2010 +0200
@@ -18,7 +18,7 @@
 &EN
 
 ;Header 
-#{"IAUpdate"}, (0x2000f85a), 1, 0, 0, TYPE=SA
+#{"Software update"}, (0x2000f85a), 1, 0, 0, TYPE=SA
 
 ;Localised Vendor Name
 %{"Nokia"}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/iaupdateapi_stub/sis/make_iaupdate_stub.bat	Mon Jan 18 20:28:24 2010 +0200
@@ -0,0 +1,16 @@
+@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 "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
+makesis -s iaupdate_stub.pkg iaupdate_stub.sis

--- a/ncdengine/provider/deviceinteraction/src/ncdinstallationserviceimpl.cpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/ncdengine/provider/deviceinteraction/src/ncdinstallationserviceimpl.cpp	Mon Jan 18 20:28:24 2010 +0200
@@ -591,7 +591,6 @@
     // 0.0.0
     if ( err == KErrNone && 
          status == ENcdApplicationInstalled &&
-         installedVersion != TCatalogsVersion() &&
          aVersion != TCatalogsVersion() ) 
         {
         DLINFO(("Installed version: %d.%d.%d, comparing to: %d.%d.%d",

--- a/secureswitools/openssllib/import/inc/openssl/comp.h	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/openssllib/import/inc/openssl/comp.h	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 HEADER_COMP_H
 #define HEADER_COMP_H

--- a/secureswitools/openssllib/import/inc/openssl/ebcdic.h	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/openssllib/import/inc/openssl/ebcdic.h	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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: 
-*
-*/
 /* crypto/ebcdic.h */
 
 #ifndef HEADER_EBCDIC_H

--- a/secureswitools/openssllib/import/inc/openssl/opensslconf.h	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/openssllib/import/inc/openssl/opensslconf.h	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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: 
-*
-*/
 /* opensslconf.h */
 /* WARNING: Generated automatically from opensslconf.h.in by Configure. */
 

--- a/secureswitools/openssllib/import/inc/openssl/opensslv.h	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/openssllib/import/inc/openssl/opensslv.h	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 HEADER_OPENSSLV_H
 #define HEADER_OPENSSLV_H
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOM.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOM.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMHEADER_GUARD_HPP
 #define DOMHEADER_GUARD_HPP
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMAttr.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMAttr.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMAttr_HEADER_GUARD_
 #define DOMAttr_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMBuilder.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMBuilder.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMBuilder_HEADER_GUARD_
 #define DOMBuilder_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMCDATASection.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMCDATASection.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMCDataSection_HEADER_GUARD_
 #define DOMCDataSection_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMCharacterData.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMCharacterData.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMCharacterData_HEADER_GUARD_
 #define DOMCharacterData_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMComment.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMComment.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMComment_HEADER_GUARD_
 #define DOMComment_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMConfiguration.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMConfiguration.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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: 
-*
-*/
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMDocument.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMDocument.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMDocument_HEADER_GUARD_
 #define DOMDocument_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMDocumentFragment.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMDocumentFragment.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMDocumentFragment_HEADER_GUARD_
 #define DOMDocumentFragment_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMDocumentRange.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMDocumentRange.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMDocumentRange_HEADER_GUARD_
 #define DOMDocumentRange_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMDocumentTraversal.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMDocumentTraversal.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMDocumentTraversal_HEADER_GUARD_
 #define DOMDocumentTraversal_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMDocumentType.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMDocumentType.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMDocumentType_HEADER_GUARD_
 #define DOMDocumentType_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMElement.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMElement.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMElement_HEADER_GUARD_
 #define DOMElement_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMEntity.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMEntity.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMEntity_HEADER_GUARD_
 #define DOMEntity_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMEntityReference.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMEntityReference.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMEntityReference_HEADER_GUARD_
 #define DOMEntityReference_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMEntityResolver.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMEntityResolver.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMEntityResolver_HEADER_GUARD_
 #define DOMEntityResolver_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMError.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMError.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMError_HEADER_GUARD_
 #define DOMError_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMErrorHandler.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMErrorHandler.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMErrorHandler_HEADER_GUARD_
 #define DOMErrorHandler_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMException.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMException.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMException_HEADER_GUARD_
 #define DOMException_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMImplementation.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMImplementation.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMImplementation_HEADER_GUARD_
 #define DOMImplementation_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMImplementationLS.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMImplementationLS.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMImplementationLS_HEADER_GUARD_
 #define DOMImplementationLS_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMImplementationRegistry.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMImplementationRegistry.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMImplementationRegistry_HEADER_GUARD_
 #define DOMImplementationRegistry_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMImplementationSource.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMImplementationSource.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMImplementationSource_HEADER_GUARD_
 #define DOMImplementationSource_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMInputSource.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMInputSource.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMInputSource_HEADER_GUARD_
 #define DOMInputSource_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMLocator.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMLocator.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMLocator_HEADER_GUARD_
 #define DOMLocator_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMNamedNodeMap.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMNamedNodeMap.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMNamedNodeMap_HEADER_GUARD_
 #define DOMNamedNodeMap_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMNode.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMNode.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMNode_HEADER_GUARD_
 #define DOMNode_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMNodeFilter.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMNodeFilter.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMNodeFilter_HEADER_GUARD_
 #define DOMNodeFilter_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMNodeIterator.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMNodeIterator.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMNodeIterator_HEADER_GUARD_
 #define DOMNodeIterator_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMNodeList.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMNodeList.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMNodeList_HEADER_GUARD_
 #define DOMNodeList_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMNotation.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMNotation.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMNotation_HEADER_GUARD_
 #define DOMNotation_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMPSVITypeInfo.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMPSVITypeInfo.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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: 
-*
-*/
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMProcessingInstruction.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMProcessingInstruction.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMProcessingInstruction_HEADER_GUARD_
 #define DOMProcessingInstruction_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMRange.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMRange.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMRange_HEADER_GUARD_
 #define DOMRange_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMRangeException.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMRangeException.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMRangeException_HEADER_GUARD_
 #define DOMRangeException_HEADER_GUARD_
 

--- a/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMText.hpp	Thu Jan 07 12:52:45 2010 +0200
+++ b/secureswitools/swisistools/source/xmlparser/xerces/include/xercesc/dom/DOMText.hpp	Mon Jan 18 20:28:24 2010 +0200
@@ -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 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 DOMText_HEADER_GUARD_
 #define DOMText_HEADER_GUARD_