diff -r 09b1ac925e3f -r 03674e5abf46 securitydialogs/lockapp/group/lockapp.mmp
--- a/securitydialogs/lockapp/group/lockapp.mmp	Tue Aug 31 16:04:40 2010 +0300
+++ b/securitydialogs/lockapp/group/lockapp.mmp	Wed Sep 01 12:19:59 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007 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"
@@ -11,40 +11,126 @@
 *
 * Contributors:
 *
-* Description: Implementation of lockapp
-*
+* Description:  Keyguard and Devicelock application server LockApp
+ *
 */
 
-// To get the APP_LAYER_SYSTEMINCLUDE-definition
+
 #include <platform_paths.hrh>
+#include <data_caging_paths.hrh>
 
-#include "defaultcaps.hrh"
-CAPABILITY CAP_APPLICATION ProtServ NetworkControl
+TARGET          lockapp.exe
+TARGETTYPE      exe
+EPOCSTACKSIZE   0x5000
 
-TARGET        lockapp.exe
+VENDORID        VID_DEFAULT
 
-targettype exe
+// ProtServ for being a server
+// WriteDeviceData Devicelock configuration needs it
+// SWEvent for capturing/generating key events
+// NetworkServices for remote lock for devicelock
 
-EPOCSTACKSIZE      0x5000
+CAPABILITY      CAP_APPLICATION ProtServ NetworkControl
 
 UID             0x100039CE 0x10283322
-SECUREID        0x100059B5
-VENDORID        VID_DEFAULT
+
+SECUREID 0x100059B5
+
+//LANG            SC
 
 SOURCEPATH      ../src
-SOURCE          lockapp.cpp
+
+// AppArc framework
+SOURCE          lockappapplication.cpp
+SOURCE          lockappappui.cpp
+SOURCE          lockappdocument.cpp
+
+// State control
+SOURCE          lockappobserverlist.cpp
+SOURCE          lockappstatecontrol.cpp
+SOURCE          lockappbasecontrol.cpp
+
+// State observers
+SOURCE          lockappidlecontrol.cpp
+SOURCE          lockappkeyguardcontrol.cpp
+SOURCE          lockappdevicelockcontrol.cpp
+SOURCE          lockappdevicelockcontainer.cpp
+SOURCE          lockappecsdetector.cpp
+SOURCE          lockappstatepublisher.cpp
+
+// CenRep and PS observers
+SOURCE          lockappcenrepobserver.cpp
+SOURCE          lockapppubsubobserver.cpp
 
-USERINCLUDE     . ../inc 
+// Keyguard notes
+SOURCE          lockappsleepingnote.cpp
+SOURCE          lockapplockednote.cpp
+SOURCE          lockappecsnote.cpp
+
+// LockApp Server
+SOURCE          lockappserver.cpp
+SOURCE          lockappsession.cpp
 
-MW_LAYER_SYSTEMINCLUDE
+// LockApp Utils
+SOURCE          lockappkeycapturecontroller.cpp
+SOURCE          lockappkeypattern.cpp
+SOURCE          lockapputils.cpp
+SOURCE          lockappwait.cpp
+
+SOURCEPATH      ../group
+
+USERINCLUDE     ../inc ../loc ../cenrep
+
+APP_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE   ../../../inc
+
 
-// Symbian
-LIBRARY         euser.lib
-LIBRARY         efsrv.lib
-LIBRARY	ws32.lib
-LIBRARY	eikcore.lib
-LIBRARY	apgrfx.lib
-LIBRARY	apparc.lib
-LIBRARY	cone.lib
+LIBRARY         euser.lib // USER services
+LIBRARY         apparc.lib  // application architecture
+LIBRARY         cone.lib   // Cone
+LIBRARY         bafl.lib // BaflUtils, reading localisation resources
+LIBRARY         ws32.lib // accessing window groups
+LIBRARY         apgrfx.lib // accessing window group names
+LIBRARY         eikcore.lib  // eikon environment
+LIBRARY         eikcoctl.lib // ceikstatuspane
+LIBRARY         eikdlg.lib // eikdialogs
+LIBRARY         gdi.lib  // drawing
+LIBRARY         fbscli.lib // required for CFbsBitmap
+LIBRARY         efsrv.lib // server library
+LIBRARY         etel.lib  // telephony
+LIBRARY         etelmm.lib // telephony
+LIBRARY         customapi.lib // custom api
+LIBRARY         centralrepository.lib // central repository
+LIBRARY         cenrepnotifhandler.lib // central repository notify handler
+LIBRARY         featmgr.lib // feature manager
+LIBRARY         cdlengine.lib // layout engine
+LIBRARY         avkon.lib  // Avkon
+LIBRARY         aknicon.lib // icon support
+LIBRARY         aknlayout2.lib // old layouts
+LIBRARY         aknlayout2scalable.lib // new layouts
+LIBRARY         aknskins.lib // skins
+LIBRARY         aknnotify.lib // aknsmallindicator
+LIBRARY         activitymanager.lib // Activity manager
+LIBRARY         secui.lib // Security UI
+
+LIBRARY         flogger.lib // File logging
+
+LIBRARY         keylockpolicyapi.lib // Keylock policy
+
+#ifdef __SAP_TERMINAL_CONTROL_FW
+LIBRARY         scpclient.lib
+#endif // __SAP_TERMINAL_CONTROL_FW
+
+START RESOURCE ../data/lockapp.rss
+HEADER
+TARGETPATH APP_RESOURCE_DIR
+//LANG SC
+LANGUAGE_IDS
+END
+
+START RESOURCE ../data/lockapp_reg.rss
+TARGETPATH	/private/10003a3f/apps
+END
+
 
 SMPSAFE