Breaking DRM's dependency Etel so that AVKON can start. The ROM now boots, but doesn't seem to have any items in the matrix menu at all.
authorTom Pritchard <tomp@symbian.org>
Wed, 27 Oct 2010 15:05:33 +0100
changeset 90 62156f66dbad
parent 89 1650c5a7be8c
child 91 303d3e345b01
Breaking DRM's dependency Etel so that AVKON can start. The ROM now boots, but doesn't seem to have any items in the matrix menu at all.
breakdeps/DRMEngine/DRMClock.cpp
breakdeps/DRMEngine/DRMClock.h
breakdeps/DRMEngine/DRMRightsServer.cpp
breakdeps/DRMEngine/DrmStdKeyStorage.cpp
breakdeps/DRMEngine/DrmStdKeyStorage.mmp
breakdeps/DRMEngine/ROAPHandler.mmp
breakdeps/DRMEngine/RightsServer.mmp
breakdeps/DRMEngine/RoapEng.cpp
startup/customcmds.mmp
startup/customcmdsu.def
startup/ssmcustomcmdfactory.cpp
syborg_stem/rom_content.csv
syborg_stem/static_dependencies.txt
syborg_stem/syborg_stem_rom.oby
--- a/breakdeps/DRMEngine/DRMClock.cpp	Wed Oct 27 14:58:16 2010 +0100
+++ b/breakdeps/DRMEngine/DRMClock.cpp	Wed Oct 27 15:05:33 2010 +0100
@@ -91,7 +91,7 @@
     // Create a notifier instance
     iNotifier = CDRMNotifier::NewL();
         
-#ifndef __WINS__
+#if 0 //ndef __WINS__
     ConnectToPhoneL();            
             
     iObserver = CDRMNitzObserver::NewL( iPhone, const_cast<CDRMClock*>(this));
@@ -155,7 +155,7 @@
         iNotifier = 0;
         }
         
-#ifndef __WINS__
+#if 0 //ndef __WINS__
     if(iObserver)            
         {
         iObserver->Cancel();
@@ -353,7 +353,7 @@
 void CDRMClock::ConnectToPhoneL()
     {
     DRMLOG( _L( "CDRMClock::ConnectToPhoneL" ) );
-    
+#if 0    
     const TInt KTriesToConnectServer(10);
     const TInt KTimeBeforeRetryingServerConnection(100000);
     TInt thisTry(0);
@@ -390,8 +390,9 @@
     
     iPhone.GetSubscriberId( status, imsi );
     User::WaitForRequest( status );
-    
+	
     DRMLOG( imsi );    
+ #endif   
     DRMLOG( _L( "CDRMClock::ConnectToPhoneL ok" ) );
     };
 
--- a/breakdeps/DRMEngine/DRMClock.h	Wed Oct 27 14:58:16 2010 +0100
+++ b/breakdeps/DRMEngine/DRMClock.h	Wed Oct 27 15:05:33 2010 +0100
@@ -25,7 +25,7 @@
 #include <e32std.h>
 #include <e32def.h>		// Type definitions
 #include <bacntf.h>
-#include <etelmm.h>
+//#include <etelmm.h>
 #include <DRMTypes.h>
 #include <e32property.h>
 
@@ -157,11 +157,13 @@
         // Variables
         CDRMNotifier* iNotifier;   
         
-        // Nitz information handles      
+        // Nitz information handles   
+#if 0		
         RTelServer iEtelServer;
         RMobilePhone iPhone;
         CDRMNitzObserver* iObserver;
-        
+#endif        
+
         // GPS watcher component, updates DRM time from GPS if available
         CGPSWatcher* iGpsWatcher;
     };
--- a/breakdeps/DRMEngine/DRMRightsServer.cpp	Wed Oct 27 14:58:16 2010 +0100
+++ b/breakdeps/DRMEngine/DRMRightsServer.cpp	Wed Oct 27 15:05:33 2010 +0100
@@ -136,7 +136,7 @@
 LOCAL_C void SignalClient();
 LOCAL_C TInt StartDBServer( void );
 
-#if defined( __WINS__ )
+#if 1 //defined( __WINS__ )
 #else
 #define DRM_USE_SERIALNUMBER_URI
 #include <mmtsy_names.h>
@@ -818,6 +818,7 @@
     MDrmKeyStorage* storage = DrmKeyStorageNewL();
     TRAP( r, storage->GetDeviceSpecificKeyL( aKey ) );
     delete storage;
+    DRMLOG2( _L( "CDRMRightsServer::GetDbKey err=%d" ),r );
     User::LeaveIfError( r );
     }
 
@@ -972,7 +973,7 @@
         return *iIMSI;
         }
 
-#ifndef __WINS__
+#if 0 // defined(__WINS__)
     TInt error( KErrNone );
     TInt count( 0 );
     TInt count2( 0 );
--- a/breakdeps/DRMEngine/DrmStdKeyStorage.cpp	Wed Oct 27 14:58:16 2010 +0100
+++ b/breakdeps/DRMEngine/DrmStdKeyStorage.cpp	Wed Oct 27 15:05:33 2010 +0100
@@ -164,8 +164,10 @@
 void DoUnloadPhoneModule( TAny* aAny )
     {
     __ASSERT_DEBUG( aAny, User::Invariant() );
+#if 0
     TUnloadModule* module = ( TUnloadModule* ) aAny;
     module->iServer->UnloadPhoneModule( *( module->iName ) );
+#endif
     }
 
 
@@ -1063,7 +1065,7 @@
         return *iImei;
         }
 
-#if (defined __WINS__ || defined WINSCW)
+#if 1// (defined __WINS__ || defined WINSCW)
     // Default IMEI used for emulator
     _LIT( KDefaultSerialNumber, "123456789123456789" );
     iImei = KDefaultSerialNumber().AllocL();
--- a/breakdeps/DRMEngine/DrmStdKeyStorage.mmp	Wed Oct 27 14:58:16 2010 +0100
+++ b/breakdeps/DRMEngine/DrmStdKeyStorage.mmp	Wed Oct 27 15:05:33 2010 +0100
@@ -18,22 +18,22 @@
 
 #include <platform_paths.hrh>
 
-TARGET          DrmStdKeyStorage.dll
+TARGET          stem_DrmStdKeyStorage.dll
 TARGETTYPE      DLL
 UID             0x1000008D 0x10205CAF
 CAPABILITY      CAP_GENERAL_DLL DRM CommDD
 VENDORID        VID_DEFAULT
 
-USERINCLUDE     ../keystorage/inc
-USERINCLUDE     ../utils/inc
-USERINCLUDE	    ../../../inc   // ADo level inc dir
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/keystorage/inc
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/utils/inc
+USERINCLUDE	    /sf/mw/drm/omadrm/drmengine/../../inc   // ADo level inc dir
 
 // Default system include paths for middleware layer modules.
 MW_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE   /epoc32/include/libc
 SYSTEMINCLUDE   /epoc32/include/ecom
 
-SOURCEPATH      ../keystorage/src
+SOURCEPATH      ./
 SOURCE          DrmStdKeyStorage.cpp
 
 LIBRARY         euser.lib
@@ -46,8 +46,8 @@
 LIBRARY         pkixcert.lib
 LIBRARY         random.lib
 LIBRARY         hash.lib
-LIBRARY         etel.lib
-LIBRARY	        etelmm.lib
+//LIBRARY         etel.lib
+//LIBRARY	        etelmm.lib
 LIBRARY         flogger.lib
 LIBRARY		featmgr.lib
 
@@ -56,13 +56,13 @@
 #endif
 
 #if defined(ARMCC)
-deffile ../eabi/ 
+deffile /sf/mw/drm/omadrm/drmengine/eabi/DrmStdKeyStorage.def
 #elif defined( WINSCW )
-deffile ../bwinscw/ 
+deffile /sf/mw/drm/omadrm/drmengine/bwinscw/DrmStdKeyStorage.def
 #elif defined( WINS )
-deffile ../bwins/ 
+deffile /sf/mw/drm/omadrm/drmengine/bwins/DrmStdKeyStorage.def
 #else
-deffile ../bmarm/ 
+deffile /sf/mw/drm/omadrm/drmengine/bmarm/DrmStdKeyStorage.def
 #endif
 
 SMPSAFE
--- a/breakdeps/DRMEngine/ROAPHandler.mmp	Wed Oct 27 14:58:16 2010 +0100
+++ b/breakdeps/DRMEngine/ROAPHandler.mmp	Wed Oct 27 15:05:33 2010 +0100
@@ -19,33 +19,35 @@
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
 
-TARGET          ROAPHandler.dll
+TARGET          stem_ROAPHandler.dll
 TARGETTYPE      DLL
 UID             0x1000008D 0x101F6DB5
 CAPABILITY      CAP_GENERAL_DLL DRM
 VENDORID        VID_DEFAULT
 
-USERINCLUDE     ../dcf/inc
-USERINCLUDE     ../dm/inc
-USERINCLUDE     ../agentv2/inc
-USERINCLUDE     ../ro/inc
-USERINCLUDE     ../roap/inc
-USERINCLUDE     ../utils/inc
-USERINCLUDE     ../server/inc
-USERINCLUDE     ../roapstorage/inc
-USERINCLUDE     ../drmclock/Inc
-USERINCLUDE     ../dcfrepository/client/inc
-USERINCLUDE     ../../../inc   // ADo level inc dir
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/dcf/inc
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/dm/inc
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/agentv2/inc
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/ro/inc
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/roap/inc
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/utils/inc
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/server/inc
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/roapstorage/inc
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/drmclock/Inc
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/dcfrepository/client/inc
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/../../inc   // ADo level inc dir
 
 // Default system include paths for middleware layer modules.
 APP_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE   /epoc32/include/libc
 SYSTEMINCLUDE   /epoc32/include/ecom
 
-SOURCEPATH  ../roap/src
+SOURCEPATH  ./
+SOURCE      RoapEng.cpp
+
+SOURCEPATH  /sf/mw/drm/omadrm/drmengine/roap/src
 
 SOURCE      RoapEngBase.cpp
-SOURCE      RoapEng.cpp
 SOURCE      RoapTrigger.cpp
 SOURCE      RoapHttpHandler.cpp
 SOURCE      RoapConnection.cpp
@@ -80,7 +82,7 @@
 SOURCE      MeteringReportRespParser.cpp
 #endif
 
-SOURCEPATH  ../utils/src
+SOURCEPATH  /sf/mw/drm/omadrm/drmengine/utils/src
 SOURCE      MultipartHandler.cpp
 
 LIBRARY     euser.lib
@@ -102,8 +104,8 @@
 LIBRARY     pkixcert.lib
 LIBRARY     random.lib
 LIBRARY     hash.lib
-LIBRARY     etel.lib
-LIBRARY     etelmm.lib
+//LIBRARY     etel.lib
+//LIBRARY     etelmm.lib
 LIBRARY     CharConv.lib
 LIBRARY     drmcrypto.lib
 LIBRARY     DrmParsers.lib
@@ -129,13 +131,13 @@
 LIBRARY    flogger.lib
 
 #if defined(ARMCC)
-deffile ../eabi/
+deffile /sf/mw/drm/omadrm/drmengine/eabi/ROAPHandler.def
 #elif defined( WINSCW )
-deffile ../bwinscw/
+deffile /sf/mw/drm/omadrm/drmengine/bwinscw/ROAPHandler.def
 #elif defined( WINS )
-deffile ../bwins/
+deffile /sf/mw/drm/omadrm/drmengine/bwins/ROAPHandler.def
 #else
-deffile ../bmarm/
+deffile /sf/mw/drm/omadrm/drmengine/bmarm/ROAPHandler.def
 #endif
 
 SMPSAFE
--- a/breakdeps/DRMEngine/RightsServer.mmp	Wed Oct 27 14:58:16 2010 +0100
+++ b/breakdeps/DRMEngine/RightsServer.mmp	Wed Oct 27 15:05:33 2010 +0100
@@ -18,7 +18,7 @@
 
 #include <platform_paths.hrh>
 
-TARGET          RightsServer.exe
+TARGET          stem_RightsServer.exe
 TARGETTYPE      EXE
 
 UID             0x1000008d 0x101F51F2
@@ -30,23 +30,27 @@
 SYSTEMINCLUDE   /epoc32/include/libc
 SYSTEMINCLUDE   /epoc32/include/connect
 
-USERINCLUDE     ../server/inc
-USERINCLUDE     ../agentv2/inc
-USERINCLUDE     ../ro/inc
-USERINCLUDE     ../dcf/inc
-USERINCLUDE     ../notifier/inc
-USERINCLUDE     ../utils/inc
-USERINCLUDE     ../roap/inc
-USERINCLUDE     ../roapstorage/inc
-USERINCLUDE     ../drmclock/Inc
-USERINCLUDE     ../keystorage/inc
-USERINCLUDE     ../drmbackup/inc
-USERINCLUDE     ../../../inc   // ADo level inc dir
+USERINCLUDE		./
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/server/inc
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/agentv2/inc
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/ro/inc
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/dcf/inc
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/notifier/inc
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/utils/inc
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/roap/inc
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/roapstorage/inc
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/drmclock/Inc
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/keystorage/inc
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/drmbackup/inc
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/../../inc   // ADo level inc dir
 
-SOURCEPATH      ../server/src
+SOURCEPATH		./
+SOURCE          DRMRightsServer.cpp
+SOURCE          DRMClock.cpp
+
+SOURCEPATH      /sf/mw/drm/omadrm/drmengine/server/src
 
 // DRM Engine (server side)
-SOURCE          DRMRightsServer.cpp
 SOURCE          DRMDbSession.cpp
 // SOURCE       drmpermissionlist.cpp
 SOURCE          drmparentstorage.cpp
@@ -70,19 +74,19 @@
 SOURCE          drmmeteringdb.cpp
 
 // DRM Backup implementation
-SOURCEPATH      ../drmbackup/src
+SOURCEPATH      /sf/mw/drm/omadrm/drmengine/drmbackup/src
 SOURCE          DRMBackup.cpp
 SOURCE          DRMBackupObserver.cpp
 
 // DRM Notifier
-SOURCEPATH      ../notifier/src
+SOURCEPATH      /sf/mw/drm/omadrm/drmengine/notifier/src
 
 SOURCE          DRMMessageStorage.cpp
 SOURCE          DRMNotifierServer.cpp
 SOURCE          DRMNotifierSession.cpp
 
 // RoapStorage
-SOURCEPATH      ../roapstorage/src
+SOURCEPATH      /sf/mw/drm/omadrm/drmengine/roapstorage/src
 
 SOURCE          RoapStorageClient.cpp
 SOURCE          RoapStorageServer.cpp
@@ -97,24 +101,23 @@
 
 // DRM Clock
 #ifdef __DRM_CLOCK
-SOURCEPATH      ../drmclock/Src
-SOURCE          DRMClock.cpp
+SOURCEPATH      /sf/mw/drm/omadrm/drmengine/drmclock/Src
 SOURCE          DRMClockServer.cpp
 SOURCE          DRMClockSession.cpp
 
-SOURCE          DRMNitzObserver.cpp
+//SOURCE          DRMNitzObserver.cpp
 SOURCE          GPSWatcher.cpp
 SOURCE          GPSTimeUpdater.cpp
 
 #else
 #ifdef __DRM_OMA2
-SOURCEPATH      ../DRMClock/src
+SOURCEPATH      /sf/mw/drm/omadrm/drmengine/DRMClock/src
 SOURCE          OMA2NotSupportedWithoutDRMClock:define__DRM_CLOCKvariation.cpp
 #endif // __DRM_OMA2
 #endif // __DRM_CLOCK
 
 // RDB and Process Watcher
-SOURCEPATH      ../utils/src
+SOURCEPATH      /sf/mw/drm/omadrm/drmengine/utils/src
 SOURCE          dbwatcher.cpp
 SOURCE          dirwatcher.cpp
 SOURCE          procwatcher.cpp
@@ -136,8 +139,8 @@
 LIBRARY         drmkeystorage.lib
 LIBRARY         edbms.lib
 LIBRARY         bafl.lib
-LIBRARY         etel.lib
-LIBRARY         etelmm.lib
+//LIBRARY         etel.lib
+//LIBRARY         etelmm.lib
 LIBRARY         abclient.lib
 LIBRARY         charconv.lib
 LIBRARY         dcfrep.lib
@@ -171,17 +174,17 @@
 // Uncomment the following lines to enable internal logging.
 /*
 macro _DRM_TESTING
-USERINCLUDE     ../internal/tsrc_internal
-SOURCEPATH      ../internal/tsrc_internal
+USERINCLUDE     /sf/mw/drm/omadrm/drmengine/internal/tsrc_internal
+SOURCEPATH      /sf/mw/drm/omadrm/drmengine/internal/tsrc_internal
 LIBRARY         drmdebugtools.lib
 LIBRARY         HAL.lib
 LIBRARY         charconv.lib
 */
 
 #if defined( WINSCW )
-deffile ../bwinscw/
+deffile /sf/mw/drm/omadrm/drmengine/bwinscw/RightsServer.def
 #elif defined( WINS )
-deffile ../bwins/
+deffile /sf/mw/drm/omadrm/drmengine/bwins/RightsServer.def
 #endif
 
 //SMPSAFE
--- a/breakdeps/DRMEngine/RoapEng.cpp	Wed Oct 27 14:58:16 2010 +0100
+++ b/breakdeps/DRMEngine/RoapEng.cpp	Wed Oct 27 15:05:33 2010 +0100
@@ -2159,7 +2159,7 @@
     {
     LOGLIT( "-> CRoapEng::GetDeviceDetailsL" )
 
-#ifndef __WINS__
+#if 0
     TInt numPhone = 0;
     TUint32 caps = 0;
     TName tsyName;
--- a/startup/customcmds.mmp	Wed Oct 27 14:58:16 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// customcmds.dll Reference custom command library
-// 
-//
-
-/**
- @file
-*/
-
-TARGET          stem_customcmds.dll
-TARGETTYPE		dll
-TARGETPATH      /sys/bin
-
-UID				0x1000008D 0x2000E662
-VENDORID 		0x70000001
-
-#ifdef WINSCW
-#error This won't build for WINSCW
-#else
-DEFFILE         ./customcmds.def
-#endif
-
-CAPABILITY 		PowerMgmt ReadDeviceData WriteDeviceData ProtServ DiskAdmin SwEvent
-
-USERINCLUDE		/sf/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/custcmd/inc
-USERINCLUDE		/sf/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/localinc
-USERINCLUDE		/sf/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/clayer/inc
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-SOURCEPATH		./
-SOURCE  		ssmcustomcmdfactory.cpp
-
-SOURCEPATH		/sf/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/custcmd/src
-SOURCE  		cmdcoopsysstatechange.cpp
-SOURCE			cmdpublishstartupmode.cpp
-SOURCE  		securitynoteobserver.cpp
-SOURCE 			cmddeletetempfiles.cpp
-
-SOURCEPATH		/sf/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/localsrc
-SOURCE			ssmpanic.cpp
-
-LIBRARY		euser.lib
-LIBRARY		efsrv.lib
-LIBRARY		ssmcmn.lib
-LIBRARY		centralrepository.lib
-LIBRARY		ssmuiproviderdll.lib
-LIBRARY		ssmadaptationcli.lib
-LIBRARY		bafl.lib
-
-SMPSAFE
--- a/startup/customcmdsu.def	Wed Oct 27 14:58:16 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-EXPORTS
-	_ZN19SsmCustomCmdFactory23CmdSimSecurityCheckNewLEv @ 1 NONAME ABSENT
-	_ZN19SsmCustomCmdFactory22CmdCoopSysSelfTestNewLEv @ 2 NONAME ABSENT
-	_ZN19SsmCustomCmdFactory32CmdCcoopSysPerformRfsActionsNewLEv @ 3 NONAME ABSENT
-	_ZN19SsmCustomCmdFactory33CmdActivateRfForEmergencyCallNewLEv @ 4 NONAME ABSENT
-	_ZN19SsmCustomCmdFactory35CmdCoopSysPerformRestartActionsNewLEv @ 5 NONAME ABSENT
-	_ZN19SsmCustomCmdFactory35CmdDeactivateRfForEmergencyCallNewLEv @ 6 NONAME ABSENT
-	_ZN19SsmCustomCmdFactory37CmdCcoopSysPerformShutdownActionsNewLEv @ 7 NONAME ABSENT
-	_ZN19SsmCustomCmdFactory25CmdCoopSysStateChangeNewLEv @ 8 NONAME
-	_ZN19SsmCustomCmdFactory25CmdPublishStartupModeNewLEv @ 9 NONAME
-	_ZN19SsmCustomCmdFactory32CmdPublishSimOwnedAndChangedNewLEv @ 10 NONAME ABSENT
-	_ZN19SsmCustomCmdFactory26CmdDeviceSecurityCheckNewLEv @ 11 NONAME ABSENT
-	_ZN19SsmCustomCmdFactory18CmdValidateRTCNewLEv @ 12 NONAME ABSENT
-	_ZN19SsmCustomCmdFactory21CmdCheckUserDriveNewLEv @ 13 NONAME ABSENT
-	_ZN19SsmCustomCmdFactory19CmdInitRamDriveNewLEv @ 14 NONAME ABSENT
-	_ZN19SsmCustomCmdFactory22CmdDeleteTempFilesNewLEv @ 15 NONAME
-	_ZN19SsmCustomCmdFactory25CmdClearStartupReasonNewLEv @ 16 NONAME ABSENT
-
--- a/startup/ssmcustomcmdfactory.cpp	Wed Oct 27 14:58:16 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file
- @internalComponent
- @released
-*/
-
-#include "ssmcustomcmdfactory.h"
-/*
-#include "cmdsimsecuritycheck.h"
-#include "cmddevicesecuritycheck.h"
-#include "cmdcoopsysselftest.h"
-#include "cmdcoopsysperformrestartactions.h"
-#include "cmdcoopsysperformshutdownactions.h"
-#include "cmdcoopsysperformrfsactions.h"
-#include "cmdactivaterfforemergencycall.h"
-#include "cmddeactivaterfforemergencycall.h"
-*/
-#include "cmdcoopsysstatechange.h"
-#include "cmdpublishstartupmode.h"
-/*
-#include "cmdpublishsimownedandchanged.h"
-#include "cmdvalidatertc.h"
-#include "cmdcheckuserdrive.h"
-#include "cmdinitramdrive.h"
-#include "cmdclearstartupreason.h"
-*/
-#include "cmddeletetempfiles.h"
-
-/*
-EXPORT_C MSsmCustomCommand* SsmCustomCmdFactory::CmdSimSecurityCheckNewL()
-	{
-	CCustomCmdSimSecurityCheck* self = CCustomCmdSimSecurityCheck::NewL();
-	return self;
-	}
-
-EXPORT_C MSsmCustomCommand* SsmCustomCmdFactory::CmdCoopSysSelfTestNewL()
-	{
-	CCustomCmdCoopSysSelfTest* self = CCustomCmdCoopSysSelfTest::NewL();
-	return self;
-	}
-
-EXPORT_C MSsmCustomCommand* SsmCustomCmdFactory::CmdCoopSysPerformRestartActionsNewL()
-	{
-	CCustomCmdCoopSysPerformRestartActions* self = CCustomCmdCoopSysPerformRestartActions::NewL();
-	return self;
-	}
-
-EXPORT_C MSsmCustomCommand* SsmCustomCmdFactory::CmdCcoopSysPerformShutdownActionsNewL()
-	{
-	CCustomCmdCoopSysPerformShutdownActions* self = CCustomCmdCoopSysPerformShutdownActions::NewL();
-	return self;
-	}
-
-EXPORT_C MSsmCustomCommand* SsmCustomCmdFactory::CmdCcoopSysPerformRfsActionsNewL()
-	{
-	CCustomCmdCoopSysPerformRfsActions* self = CCustomCmdCoopSysPerformRfsActions::NewL();
-	return self;
-	}
-
-EXPORT_C MSsmCustomCommand* SsmCustomCmdFactory::CmdActivateRfForEmergencyCallNewL()
-	{
-	CCustomCmdActivateRfForEmergencyCall* self = CCustomCmdActivateRfForEmergencyCall::NewL();
-	return self;
-	}
-
-EXPORT_C MSsmCustomCommand* SsmCustomCmdFactory::CmdDeactivateRfForEmergencyCallNewL()
-	{
-	CCustomCmdDeactivateRfForEmergencyCall* self = CCustomCmdDeactivateRfForEmergencyCall::NewL();
-	return self;
-	}
-*/
-EXPORT_C MSsmCustomCommand* SsmCustomCmdFactory::CmdCoopSysStateChangeNewL()
-	{
-	CCustomCmdCoopSysStateChange* self = CCustomCmdCoopSysStateChange::NewL();
-	return self;
-	}
-
-EXPORT_C MSsmCustomCommand* SsmCustomCmdFactory::CmdPublishStartupModeNewL()
-	{
-	CCustomCmdPublishStartupMode* self = CCustomCmdPublishStartupMode::NewL();
-	return self;
-	}
-/*
-EXPORT_C MSsmCustomCommand* SsmCustomCmdFactory::CmdPublishSimOwnedAndChangedNewL()
-	{
-	CCustomCmdPublishSimOwnedAndChanged* self = CCustomCmdPublishSimOwnedAndChanged::NewL();
-	return self;
-	}
-
-EXPORT_C MSsmCustomCommand* SsmCustomCmdFactory::CmdDeviceSecurityCheckNewL()
-	{
-	CCustomCmdDeviceSecurityCheck* self = CCustomCmdDeviceSecurityCheck::NewL();
-	return self;
-	}
-
-EXPORT_C MSsmCustomCommand* SsmCustomCmdFactory::CmdValidateRTCNewL()
-    {
-    CCustomCmdValidateRTC* self = CCustomCmdValidateRTC::NewL();
-    return self;
-    }
-
-EXPORT_C MSsmCustomCommand* SsmCustomCmdFactory::CmdCheckUserDriveNewL()
-    {
-    CCustomCmdCheckUserDrive* self = CCustomCmdCheckUserDrive::NewL();
-	return self;
-    }
-
-EXPORT_C MSsmCustomCommand* SsmCustomCmdFactory::CmdInitRamDriveNewL()
-    {
-    CCustomCmdInitRamDrive* self = CCustomCmdInitRamDrive::NewL();
-    return self;
-    }
-
-EXPORT_C MSsmCustomCommand* SsmCustomCmdFactory::CmdClearStartupReasonNewL()
-    {
-    CCustomCmdClearStartupReason* self = CCustomCmdClearStartupReason::NewL();
-    return self;
-    }
-*/
-
-EXPORT_C MSsmCustomCommand* SsmCustomCmdFactory::CmdDeleteTempFilesNewL()
-    {
-    CCustomCmdDeleteTempFiles* self = CCustomCmdDeleteTempFiles::NewL();
-    return self;
-    }
--- a/syborg_stem/rom_content.csv	Wed Oct 27 14:58:16 2010 +0100
+++ b/syborg_stem/rom_content.csv	Wed Oct 27 15:05:33 2010 +0100
@@ -249,7 +249,7 @@
 private\101F7988\esock_sip.cmi,/epoc32/data/z/private/101f7988/esock_sip.cmi,sipproviders.iby,mw/ipappprotocols,,,
 private\101F7988\esock_smswap.cmi,/epoc32/data/z/private/101f7988/esock_smswap.cmi,esock.iby,os/commsfw,,,
 private\101F7988\esock_tr.cmi,/epoc32/data/z/private/101f7988/esock_tr.cmi,esock.iby,os/commsfw,,,
-private\101F7988\etel.cmi,/epoc32/data/z/private/101f7988/etel.cmi,etel.iby,os/cellularsrv,,,
+private\101F7988\etel.cmi,/epoc32/data/z/private/101f7988/etel.cmi,etel.iby,os/cellularsrv,out,TomP,Must remove this when you remove etel.dll
 private\101F7989\backup_registration.xml,/epoc32/data/z/private/101f7989/backup_registration.xml,esock_core.iby,os/commsfw,,,
 Private\101F7989\Bluetooth\bluetooth_stack.ini,/epoc32/data/z/private/101f7989/bluetooth/bluetooth_stack.ini,bluetooth.iby,os/bt,,,
 Private\101F7989\Bluetooth\cmdq.ini,/epoc32/data/z/private/101f7989/bluetooth/cmdq.ini,hci_framework.iby,os/bt,,,
@@ -3396,7 +3396,7 @@
 sys\bin\DrmServiceAPI.dll,/epoc32/release/armv5/urel/drmserviceapi.dll,core/mw/drm5.iby,mw/drm,,,
 sys\bin\drmserviceapiwrapper.dll,/epoc32/release/armv5/urel/drmserviceapiwrapper.dll,core/mw/drmserviceapiwrapper.iby,mw/drm,,,
 Sys\Bin\drmsettingsplugin.dll,/epoc32/release/armv5/urel/drmsettingsplugin.dll,core/mw/drmsettingsplugin.iby,mw/drm,,,
-sys\bin\DrmStdKeyStorage.dll,/epoc32/release/armv5/urel/drmstdkeystorage.dll,core/mw/drm5.iby,mw/drm,,,
+sys\bin\DrmStdKeyStorage.dll,/epoc32/release/armv5/urel/drmstdkeystorage.dll,core/mw/drm5.iby,mw/drm,stem,TomP,Break dependence on etel.dll
 Sys\Bin\DRMstringdict00.dll,/epoc32/release/armv5/urel/drmstringdict00.dll,rohandler.iby,mw/messagingmw,,,
 sys\bin\DRMUiHandling.dll,/epoc32/release/armv5/urel/drmuihandling.dll,core/mw/drmutility.iby,mw/drm,,,
 sys\bin\DRMUiHandlingImpl.dll,/epoc32/release/armv5/urel/drmuihandlingimpl.dll,core/mw/drmutility.iby,mw/drm,,,
@@ -5173,7 +5173,7 @@
 sys\bin\RfsServer.exe,/epoc32/release/armv5/urel/rfsserver.exe,core/mw/rfs.iby,mw/appsupport,,,
 sys\bin\rfstatusswppolicy.dll,/epoc32/release/armv5/urel/rfstatusswppolicy.dll,core/os/ssmcompatibility.iby,os/devicesrv,,,
 sys\bin\richBio.dll,/epoc32/release/armv5/urel/richbio.dll,core/app/Richbio.iby,app/messaging,,,
-sys\bin\RightsServer.EXE,/epoc32/release/armv5/urel/rightsserver.exe,core/mw/drm5.iby,mw/drm,,,
+sys\bin\RightsServer.EXE,/epoc32/release/armv5/urel/rightsserver.exe,core/mw/drm5.iby,mw/drm,stem,TomP,Break dependence on etel.dll
 sys\bin\RingBC.dll,/epoc32/release/armv5/urel/ringbc.dll,core/app/RingBC.iby,app/messaging,,,
 sys\bin\RLock.exe,/epoc32/release/armv5/urel/rlock.exe,core/mw/RemoteLock.iby,mw/securitysrv,,,
 sys\bin\RLockSettings.dll,/epoc32/release/armv5/urel/rlocksettings.dll,core/mw/RemoteLock.iby,mw/securitysrv,,,
@@ -5181,7 +5181,7 @@
 sys\bin\rm_debug.ldd,/epoc32/release/armv5/urel/rm_debug.ldd,rm_debug_svr.iby,os/kernelhwsrv,,,
 sys\bin\rm_debug_svr.exe,/epoc32/release/armv5/urel/rm_debug_svr.exe,rm_debug_svr.iby,os/kernelhwsrv,,,
 sys\bin\RoapApp.exe,/epoc32/release/armv5/urel/roapapp.exe,core/mw/CodHandler.iby,mw/web,,WR,application
-sys\bin\RoapHandler.DLL,/epoc32/release/armv5/urel/roaphandler.dll,core/mw/drm5.iby,mw/drm,,,
+sys\bin\RoapHandler.DLL,/epoc32/release/armv5/urel/roaphandler.dll,core/mw/drm5.iby,mw/drm,stem,TomP,Break dependence on etel.dll
 Sys\Bin\roapphandler.dll,/epoc32/release/armv5/urel/roapphandler.dll,rohandler.iby,mw/messagingmw,,,
 Sys\Bin\roaptcontenthandler.dll,/epoc32/release/armv5/urel/roaptcontenthandler.dll,rohandler.iby,mw/messagingmw,,,
 Sys\Bin\rocontenthandler.dll,/epoc32/release/armv5/urel/rocontenthandler.dll,rohandler.iby,mw/messagingmw,,,
--- a/syborg_stem/static_dependencies.txt	Wed Oct 27 14:58:16 2010 +0100
+++ b/syborg_stem/static_dependencies.txt	Wed Oct 27 15:05:33 2010 +0100
@@ -1928,7 +1928,7 @@
 sys\bin\DrmRightsInfoImpl.dll	/epoc32/release/armv5/urel/drmrightsinfoimpl.dll	sid=10282e25:DrmServerInterfaces[101f6db5].dll:charconv[10003b11].dll:drmutilitycommon[10283302].dll:drtaeabi.dll:euser[100039e5].dll:scppnwdl.dll
 sys\bin\DrmServerInterfaces.DLL	/epoc32/release/armv5/urel/drmserverinterfaces.dll	sid=101f6db5:DrmCrypto[101f6db9].dll:DrmRights[10205cae].dll:crypto[10005e0b].dll:drtaeabi.dll:efsrv[100039e4].dll:estor[10003b0d].dll:euser[100039e5].dll:featmgr[10005a2b].dll:hash[10005e11].dll:inetprotutil[100041d1].dll:scppnwdl.dll:x509[10005e0e].dll
 sys\bin\DrmServiceAPI.dll	/epoc32/release/armv5/urel/drmserviceapi.dll	sid=10282cb1:DrmServerInterfaces[101f6db5].dll:drtaeabi.dll:euser[100039e5].dll:scppnwdl.dll
-sys\bin\DrmStdKeyStorage.dll	/epoc32/release/armv5/urel/drmstdkeystorage.dll	sid=10205caf:asn1[10005e09].dll:cryptography[101fd20b].dll:crypto[10005e0b].dll:drtaeabi.dll:efsrv[100039e4].dll:etelmm[100064dd].dll:etel[10003d46].dll:euser[100039e5].dll:featmgr[10005a2b].dll:hash[10005e11].dll:platformenv[101f857f].dll:random[10005e12].dll:scppnwdl.dll:x500[10005e0d].dll:x509[10005e0e].dll
+sys\bin\DrmStdKeyStorage.dll	/epoc32/release/armv5/urel/stem_drmstdkeystorage.dll	sid=10205caf:asn1[10005e09].dll:cryptography[101fd20b].dll:crypto[10005e0b].dll:drtaeabi.dll:efsrv[100039e4].dll:euser[100039e5].dll:featmgr[10005a2b].dll:hash[10005e11].dll:platformenv[101f857f].dll:random[10005e12].dll:scppnwdl.dll:x500[10005e0d].dll:x509[10005e0e].dll
 sys\bin\DrmUtilityDmgrWrapper.dll	/epoc32/release/armv5/urel/drmutilitydmgrwrapper.dll	sid=102830fe:CommonEngine[100058fe].dll:DownloadMgr[10008d5f].dll:ROAPHandler[101f6db5].dll:avkon[100056c6].dll:centralrepository[101fbc70].dll:cmmanager[10207376].dll:drtaeabi.dll:efsrv[100039e4].dll:eikctl[1000489c].dll:euser[100039e5].dll:platformenv[101f857f].dll:scppnwdl.dll
 sys\bin\Dtdmdl.dll	/epoc32/release/armv5/urel/dtdmdl.dll	sid=10005177:bnf[10005183].dll:drtaeabi.dll:efsrv[100039e4].dll:euser[100039e5].dll:scppnwdl.dll:wnode[100041f7].dll:wutil[1000517c].dll
 sys\bin\EAacPlusDecoderIntfc.dll	/epoc32/release/armv5/urel/eaacplusdecoderintfc.dll	sid=10207b1e:euser[100039e5].dll:mediaclientaudiostream[10003996].dll:mmfdevsound[100058cc].dll
@@ -2339,10 +2339,10 @@
 sys\bin\RestrictedAudioOutputProxy.dll	/epoc32/release/armv5/urel/restrictedaudiooutputproxy.dll	sid=10207b98:RestrictedAudioOutput[10207b95].dll:drtaeabi.dll:euser[100039e5].dll:mmfdevsound[100058cc].dll:scppnwdl.dll
 sys\bin\ReverseGeocode.dll	/epoc32/release/armv5/urel/reversegeocode.dll	sid=ef7e39a4:bafl[10003a0f].dll:charconv[10003b11].dll:cmmanager[10207376].dll:drtaeabi.dll:esock[10003d3f].dll:euser[100039e5].dll:extendedconnpref[20027034].dll:http[1000a441].dll:inetprotutil[100041d1].dll:lbs[101f97b1].dll:netmeta[1020430b].dll:scppnwdl.dll:xmlframework[101fadcc].dll
 sys\bin\RfsServer.exe	/epoc32/release/armv5/urel/rfsserver.exe	sid=102073ea:drtaeabi.dll:euser[100039e5].dll:rfs[10005984].dll
-sys\bin\RightsServer.EXE	/epoc32/release/armv5/urel/rightsserver.exe	sid=101f51f2:DcfRep[10205ca9].dll:DrmCrypto[101f6db9].dll:DrmKeyStorage[10205caa].dll:DrmParsers[10205cad].dll:DrmRights[10205cae].dll:DrmServerInterfaces[101f6db5].dll:abclient[10202d2d].dll:asn1[10005e09].dll:bafl[10003a0f].dll:centralrepository[101fbc70].dll:charconv[10003b11].dll:cryptography[101fd20b].dll:crypto[10005e0b].dll:drtaeabi.dll:drtrvct2_2.dll:edbms[10003b0e].dll:efsrv[100039e4].dll:eposindicator[101f7a7a].dll:estor[10003b0d].dll:etelmm[100064dd].dll:etel[10003d46].dll:euser[100039e5].dll:featmgr[10005a2b].dll:hash[10005e11].dll:inetprotutil[100041d1].dll:lbs[101f97b1].dll:platformenv[101f857f].dll:random[10005e12].dll:scppnwdl.dll:starterclient[100059ca].dll:sysutil[10005943].dll:wmdrmfileserverclient[2000b181].dll:x500[10005e0d].dll:x509[10005e0e].dll
+sys\bin\RightsServer.EXE	/epoc32/release/armv5/urel/stem_rightsserver.exe	sid=101f51f2:DcfRep[10205ca9].dll:DrmCrypto[101f6db9].dll:DrmKeyStorage[10205caa].dll:DrmParsers[10205cad].dll:DrmRights[10205cae].dll:DrmServerInterfaces[101f6db5].dll:abclient[10202d2d].dll:asn1[10005e09].dll:bafl[10003a0f].dll:centralrepository[101fbc70].dll:charconv[10003b11].dll:cryptography[101fd20b].dll:crypto[10005e0b].dll:drtaeabi.dll:drtrvct2_2.dll:edbms[10003b0e].dll:efsrv[100039e4].dll:eposindicator[101f7a7a].dll:estor[10003b0d].dll:euser[100039e5].dll:featmgr[10005a2b].dll:hash[10005e11].dll:inetprotutil[100041d1].dll:lbs[101f97b1].dll:platformenv[101f857f].dll:random[10005e12].dll:scppnwdl.dll:starterclient[100059ca].dll:sysutil[10005943].dll:wmdrmfileserverclient[2000b181].dll:x500[10005e0d].dll:x509[10005e0e].dll
 sys\bin\RingBC.dll	/epoc32/release/armv5/urel/ringbc.dll	sid=101f4cdc:AKNSKINS[10005a26].dll:AknLayout2Scalable[102040d7].dll:CdlEngine[101f8243].dll:CommonEngine[100058fe].dll:MsgEditorUtils[100007aa].dll:avkon[100056c6].dll:bafl[10003a0f].dll:centralrepository[101fbc70].dll:cone[10003a41].dll:drtaeabi.dll:efsrv[100039e4].dll:egul[100048a2].dll:eikcoctl[1000489e].dll:eikcore[10004892].dll:eikctl[1000489c].dll:etext[10003a1c].dll:euser[100039e5].dll:featmgr[10005a2b].dll:form[10003b27].dll:gdi[10003b15].dll:msgeditormediacontrol[102072e7].dll:msgeditormodel[100058bf].dll:msgs[10004e66].dll:platformenv[101f857f].dll:scppnwdl.dll
 sys\bin\RoapApp.exe	/epoc32/release/armv5/urel/roapapp.exe	sid=10008d64:AKNSKINS[10005a26].dll:CommonEngine[100058fe].dll:CommonUI[100058fd].dll:DcfRep[10205ca9].dll:DownloadMgr[10008d5f].dll:DrmRights[10205cae].dll:ROAPHandler[101f6db5].dll:apgrfx[10003a3c].dll:apmime[10003a1a].dll:apparc[10003a3d].dll:avkon[100056c6].dll:caf.dll:centralrepository[101fbc70].dll:cone[10003a41].dll:drtaeabi.dll:efsrv[100039e4].dll:eikcoctl[1000489e].dll:eikcore[10004892].dll:eikdlg[10004898].dll:euser[100039e5].dll:featmgr[10005a2b].dll:hlplch[101f423b].dll:scppnwdl.dll
-sys\bin\RoapHandler.DLL	/epoc32/release/armv5/urel/roaphandler.dll	sid=101f6db5:CommonUI[100058fd].dll:DcfRep[10205ca9].dll:DrmCrypto[101f6db9].dll:DrmParsers[10205cad].dll:DrmRights[10205cae].dll:DrmServerInterfaces[101f6db5].dll:HttpFilterCommon[101f8711].dll:apmime[10003a1a].dll:bafl[10003a0f].dll:caf.dll:centralrepository[101fbc70].dll:charconv[10003b11].dll:cmmanager[10207376].dll:commdb[10004e1c].dll:crypto[10005e0b].dll:drmroapwbxmlparser[200113bf].dll:drtaeabi.dll:drtrvct2_2.dll:ecom[10009d8e].dll:efsrv[100039e4].dll:esock[10003d3f].dll:etelmm[100064dd].dll:etel[10003d46].dll:euser[100039e5].dll:featmgr[10005a2b].dll:flogger[10004d0a].dll:hash[10005e11].dll:http[1000a441].dll:inetprotutil[100041d1].dll:platformenv[101f857f].dll:random[10005e12].dll:scppnwdl.dll:sysutil[10005943].dll:x500[10005e0d].dll:x509[10005e0e].dll:xmlframework[101fadcc].dll
+sys\bin\RoapHandler.DLL	/epoc32/release/armv5/urel/stem_roaphandler.dll	sid=101f6db5:CommonUI[100058fd].dll:DcfRep[10205ca9].dll:DrmCrypto[101f6db9].dll:DrmParsers[10205cad].dll:DrmRights[10205cae].dll:DrmServerInterfaces[101f6db5].dll:HttpFilterCommon[101f8711].dll:apmime[10003a1a].dll:bafl[10003a0f].dll:caf.dll:centralrepository[101fbc70].dll:cmmanager[10207376].dll:commdb[10004e1c].dll:crypto[10005e0b].dll:drmroapwbxmlparser[200113bf].dll:drtaeabi.dll:drtrvct2_2.dll:ecom[10009d8e].dll:efsrv[100039e4].dll:esock[10003d3f].dll:euser[100039e5].dll:featmgr[10005a2b].dll:flogger[10004d0a].dll:hash[10005e11].dll:http[1000a441].dll:inetprotutil[100041d1].dll:platformenv[101f857f].dll:random[10005e12].dll:scppnwdl.dll:x500[10005e0d].dll:x509[10005e0e].dll:xmlframework[101fadcc].dll
 sys\bin\RoomLevelEffect.dll	/epoc32/release/armv5/urel/roomleveleffect.dll	sid=10207b3c:CustomInterfaceUtility[101fafe1].dll:EffectBase[101fafdd].dll:drtaeabi.dll:euser[100039e5].dll:mediaclientaudioinputstream[10003998].dll:mediaclientaudiostream[10003996].dll:mediaclientaudio[10003992].dll:mmfdevsound[100058cc].dll:scppnwdl.dll
 sys\bin\RoomLevelMessageHandler.dll	/epoc32/release/armv5/urel/roomlevelmessagehandler.dll	sid=10207b3e:EffectBase[101fafdd].dll:drtaeabi.dll:euser[100039e5].dll:mmfcontrollerframework[101f76dd].dll:scppnwdl.dll
 sys\bin\RoomLevelProxy.dll	/epoc32/release/armv5/urel/roomlevelproxy.dll	sid=10207b3d:EffectBase[101fafdd].dll:RoomLevelEffect[10207b3c].dll:drtaeabi.dll:euser[100039e5].dll:mmfcontrollerframework[101f76dd].dll:scppnwdl.dll
--- a/syborg_stem/syborg_stem_rom.oby	Wed Oct 27 14:58:16 2010 +0100
+++ b/syborg_stem/syborg_stem_rom.oby	Wed Oct 27 15:05:33 2010 +0100
@@ -392,7 +392,6 @@
 REM faxstrm.dll
 REM faxsvr.DLL
 REM faxcli.DLL
-data=\epoc32\data\z\private\101F7988\etel.cmi 	"private\101F7988\etel.cmi"
 REM Multimode Etel
 data=\epoc32\data\Z\Private\101F7989\sms\smsu.rsc 	"private\101F7989\sms\smsu.rsc"
 data=\epoc32\data\Z\Private\101F7989\esock\smswap.Sms.esk 	"private\101F7989\esock\smswap.Sms.esk"
@@ -3373,17 +3372,20 @@
 file=\epoc32\release\ARMV5\urel\DcfRepSrv.EXE 	"sys\bin\DcfRepSrv.EXE"
 file=\epoc32\release\ARMV5\urel\DRMHELPERSERVER.EXE 	"sys\bin\DRMHELPERSERVER.EXE"
 file=\epoc32\release\ARMV5\urel\DrmKeyStorage.dll 	"sys\bin\DrmKeyStorage.dll"
+file=\epoc32\release\ARMV5\urel\stem_DrmStdKeyStorage.dll 	"sys\bin\DrmStdKeyStorage.dll"
 file=\epoc32\release\ARMV5\urel\DrmCrypto.DLL 	"sys\bin\DrmCrypto.DLL"
 file=\epoc32\release\ARMV5\urel\DrmDcf.DLL 	"sys\bin\DrmDcf.DLL"
 file=\epoc32\release\ARMV5\urel\DrmRights.DLL 	"sys\bin\DrmRights.DLL"
 file=\epoc32\release\ARMV5\urel\DrmServerInterfaces.DLL 	"sys\bin\DrmServerInterfaces.DLL"
 file=\epoc32\release\ARMV5\urel\DrmParsers.DLL 	"sys\bin\DrmParsers.DLL"
+file=\epoc32\release\ARMV5\urel\stem_RightsServer.EXE 	"sys\bin\RightsServer.EXE"
 file=\epoc32\release\ARMV5\urel\DrmServiceAPI.dll 	"sys\bin\DrmServiceAPI.dll"
 __ECOM_PLUGIN(\epoc32\release\ARMV5\urel,Sys\Bin,\epoc32\data\Z,Resource\Plugins, RECDRM.DLL , RECDRM.DLL ) 
 data=\epoc32\data\Z\private\102073ea\excludes\101F51F2.exc 	"private\102073ea\excludes\101F51F2.exc"
 __ECOM_PLUGIN(\epoc32\release\ARMV5\urel,Sys\Bin,\epoc32\data\Z,Resource\Plugins, OmaDrmAgent.dll , OmaDrmAgent.dll ) 
 __ECOM_PLUGIN(\epoc32\release\ARMV5\urel,Sys\Bin,\epoc32\data\Z,Resource\Plugins, DrmRel1_0StringDict00.dll , DrmRel1_0StringDict00.dll ) 
 __ECOM_PLUGIN(\epoc32\release\ARMV5\urel,Sys\Bin,\epoc32\data\Z,Resource\Plugins, DrmRel2_1StringDict00.dll , DrmRel2_1StringDict00.dll ) 
+file=\epoc32\release\ARMV5\urel\stem_RoapHandler.DLL 	"sys\bin\RoapHandler.DLL"
 __ECOM_PLUGIN(\epoc32\release\ARMV5\urel,Sys\Bin,\epoc32\data\Z,Resource\Plugins, HTTPFilterDRM.dll , HTTPFilterDRM.dll ) 
 data=\epoc32\data\Z\Private\101F51F2\backup_registration.xml 	"PRIVATE\101F51F2\backup_registration.xml"
 data=\epoc32\data\Z\System\Install\OmaDrm_Stub.SIS 	"system\install\OmaDrm_Stub.SIS"
@@ -4104,6 +4106,7 @@
 file=\epoc32\release\ARMV5\urel\ROMTMCLI.DLL 	"sys\bin\ROMTMCLI.DLL"
 file=\epoc32\release\ARMV5\urel\ROMTMDAT.DLL 	"sys\bin\ROMTMDAT.DLL"
 file=\epoc32\release\ARMV5\urel\ROMTMSER.DLL 	"sys\bin\ROMTMSER.DLL"
+file=\epoc32\release\ARMV5\urel\ROMTMUI.DLL 	"sys\bin\ROMTMUI.DLL"
 data=\epoc32\data\Z\resource\messaging\mtm\ROMTMREG.rsc 	"resource\messaging\mtm\ROMTMREG.rsc"
 file=\epoc32\release\ARMV5\urel\rsfwcontrol.dll 	"sys\bin\rsfwcontrol.dll"
 file=\epoc32\release\ARMV5\urel\rsfwmountman.dll 	"sys\bin\rsfwmountman.dll"