diff -r 000000000000 -r 4e1aa6a622a0 sysstatemgmt/systemstatemgr/test/tcmd/group/tcmd_server.mmp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sysstatemgmt/systemstatemgr/test/tcmd/group/tcmd_server.mmp	Tue Feb 02 00:53:00 2010 +0200
@@ -0,0 +1,261 @@
+// 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
+ @test
+ @internalComponent - Internal Symbian test code 
+*/
+ 
+
+TARGET			tcmd_server.exe
+TARGETTYPE		exe
+TARGETPATH		/sys/bin
+UID				0x1000007A 0xA0002EA1
+VENDORID		0x70000001
+
+// Use KSsmServerName SID on this test server to allow cmds to be properly executed
+SECUREID		0x2000D75B
+
+CAPABILITY 		PowerMgmt WriteDeviceData ReadDeviceData ProtServ DiskAdmin SwEvent
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+MACRO SSM_CMD_TESTFRAMEWORK
+
+
+
+// production code
+USERINCLUDE		../../../cmd/inc
+USERINCLUDE		../../../inc
+USERINCLUDE		../../../localinc
+userinclude		../../../ss/inc
+USERINCLUDE		../../../cle/inc
+
+// testcode
+USERINCLUDE		../inc
+USERINCLUDE		../../testutils/inc
+USERINCLUDE		../../testapps/inc
+
+
+SOURCEPATH		../src
+source			tcmd_step_base.cpp
+source			tcmd_cmdlist.cpp
+
+SOURCE			tcmd_server.cpp
+
+SOURCE			tcmd_step_amastarter.cpp
+SOURCE			tcmd_step_commandlist.cpp
+SOURCE			tcmd_step_customcommand.cpp
+SOURCE			tcmd_step_finalisedrives.cpp
+SOURCE			tcmd_step_loadsup.cpp
+SOURCE			tcmd_step_multiplewait.cpp
+SOURCE			tcmd_step_persisthalattributes.cpp
+SOURCE			tcmd_step_poweroff.cpp
+SOURCE			tcmd_step_publishswp.cpp
+SOURCE			tcmd_step_publishsystemstate.cpp
+SOURCE			tcmd_step_reqswpchange.cpp
+SOURCE  		tcmd_mock_ssmcommandfactory.cpp
+SOURCE			tcmd_step_resourcereader.cpp
+SOURCE			tcmd_step_setpandskey.cpp
+SOURCE			tcmd_step_startapp.cpp
+SOURCE			tcmd_step_startprocess.cpp
+SOURCE			tcmd_step_createswp.cpp
+SOURCE			tcmd_step_waitforapparcinit.cpp
+
+SOURCEPATH		../../testutils/src
+SOURCE			ssmatest_utils.cpp
+
+SOURCEPATH		../../../cmd/src
+source			ssmcommandbase.cpp
+source			ssmdeferrablecommand.cpp
+source  		ssmcommandlist.cpp
+source  		ssmcommandlistimpl.cpp
+source  		ssmcommandlistresourcereader.cpp
+source  		ssmcommandlistresourcereaderimpl.cpp
+source			ssmcommandparameters.cpp
+source			ssmcommandutilprovider.cpp
+source			ssmpublishsystemstateinfo.cpp
+source			ssmcustomcommandinfo.cpp
+source  		ssmcommandlistutils.cpp
+source			ssmcustomcommand.cpp
+source			ssmdeferreddeleter.cpp
+
+source			cmdamastarter.cpp
+source  		cmdcustomcommand.cpp
+source  		cmdfinalisedrives.cpp
+source  		cmdloadsup.cpp
+source			cmdmultiplewait.cpp
+source  		cmdpersisthalattributes.cpp
+source  		cmdpoweroff.cpp 
+source  		cmdpublishswp.cpp
+source  		cmdpublishsystemstate.cpp
+source			cmdreqswpchange.cpp
+source			cmdsetpandskey.cpp
+source			cmdstarterbase.cpp
+source			cmdstartapp.cpp
+source			cmdstartprocess.cpp
+source			cmdwaitforapparcinit.cpp
+source			cmdcreateswp.cpp
+
+
+sourcepath		../../../localsrc
+source			ssmpanic.cpp
+
+LIBRARY			euser.lib
+LIBRARY			efsrv.lib
+LIBRARY			testexecuteutils.lib 
+LIBRARY			testexecutelogclient.lib 
+LIBRARY			estor.lib
+LIBRARY			ssmcmn.lib
+LIBRARY			bafl.lib
+library			domaincli.lib
+library			ssmsuscli.lib
+library			ssmstartsafe.lib
+library			ws32.lib 
+#ifdef SYMBIAN_SSM_FLEXIBLE_MERGE 
+library 		ssmcmd.lib
+#endif
+
+STATICLIBRARY	ssmclecli.lib
+STATICLIBRARY	ssmclesrv.lib
+
+SOURCEPATH		../resource
+START RESOURCE	cmdlists1.rss
+TARGETPATH	/resource/ssmatest/cmdlists1
+END
+
+SOURCEPATH		../resource
+START RESOURCE	cmdlists2.rss
+TARGETPATH	/resource/ssmatest/cmdlists2
+END
+
+SOURCEPATH		../resource
+START RESOURCE	cmdlists3-1.rss
+TARGETPATH	/resource/ssmatest/cmdlists3
+END
+
+SOURCEPATH		../resource
+START RESOURCE	cmdlists3-2.rss
+TARGETPATH	/resource/ssmatest/cmdlists3
+END
+
+SOURCEPATH		../resource
+START RESOURCE	cmdlists4.rss
+TARGETPATH	/resource/ssmatest/cmdlists4
+END
+
+SOURCEPATH		../resource
+START RESOURCE	cmdlists5.rss
+TARGETPATH	/resource/ssmatest/cmdlists5
+END
+
+SOURCEPATH		../resource
+START RESOURCE	cmdlists6.rss
+TARGETPATH	/resource/ssmatest/cmdlists6
+END
+
+SOURCEPATH		../resource
+START RESOURCE	ssmcmd_reqswpchange1.rss
+HEADER 
+TARGETPATH	/resource/ssmatest/bic
+END
+
+SOURCEPATH		../resource
+START RESOURCE	ssmcmd_publishswp1.rss
+HEADER 
+TARGETPATH	/resource/ssmatest/bic
+END
+
+SOURCEPATH		../resource
+START RESOURCE	ssmcmd_publishsystemstate1.rss
+HEADER 
+TARGETPATH	/resource/ssmatest/bic
+END
+
+SOURCEPATH		../resource
+START RESOURCE	ssmcmd_createswp1.rss
+HEADER 
+TARGETPATH	/resource/ssmatest/bic
+END
+
+SOURCEPATH		../resource
+START RESOURCE	ssmcmd_loadsup1.rss
+HEADER 
+TARGETPATH	/resource/ssmatest/bic
+END
+
+SOURCEPATH		../resource
+START RESOURCE	ssmcmd_customcmd1.rss
+HEADER 
+TARGETPATH	/resource/ssmatest/bic
+END
+
+SOURCEPATH		../resource
+START RESOURCE	ssmcmd_startprocess1.rss
+HEADER 
+TARGETPATH	/resource/ssmatest/bic
+END
+
+SOURCEPATH		../resource
+START RESOURCE	ssmcmd_startapp.rss
+HEADER 
+TARGETPATH	/resource/ssmatest/bic
+END
+
+SOURCEPATH		../resource
+START RESOURCE	ssmcmd_amastarter.rss
+HEADER 
+TARGETPATH	/resource/ssmatest/bic
+END
+
+SOURCEPATH		../resource
+START RESOURCE	ssmcmd_multiplewait.rss
+HEADER 
+TARGETPATH	/resource/ssmatest/bic
+END
+
+SOURCEPATH		../resource
+START RESOURCE	ssmcmd_waitforapparcinit.rss
+HEADER 
+TARGETPATH	/resource/ssmatest/bic
+END
+
+
+SOURCEPATH		../resource
+START RESOURCE	ssmcmd_setpandskey.rss
+HEADER 
+TARGETPATH	/resource/ssmatest/bic
+END
+
+SOURCEPATH		../resource
+START RESOURCE	ssmcmd_poweroff1.rss
+HEADER 
+TARGETPATH	/resource/ssmatest/bic
+END
+
+SOURCEPATH		../resource
+START RESOURCE	ssmcmd_finalisedrives.rss
+HEADER 
+TARGETPATH	/resource/ssmatest/bic
+END
+
+SOURCEPATH		../resource
+START RESOURCE	ssmcmd_persisthal.rss
+HEADER 
+TARGETPATH	/resource/ssmatest/bic
+END
+
+
+SMPSAFE