diff -r 000000000000 -r 08ec8eefde2f traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggermclsuiteserver.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggermclsuiteserver.cpp	Fri Jan 22 11:06:30 2010 +0200
@@ -0,0 +1,153 @@
+// Copyright (c) 2005-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:
+// Example file/test code to demonstrate how to develop a TestExecute Server
+// Developers should take this project as a template and substitute their own
+// for (WINS && !EKA2) versions will be xxxServer.Dll and require a thread to be started
+// in the process of the client. The client initialises the server by calling the
+// one and only ordinal.
+// 
+//
+
+/**
+ @file te_uloggermclsuiteserver.cpp
+ @internalTechnology
+*/
+
+#include "te_uloggermclsuiteserver.h"
+#include "te_uloggerapiteststep.h"
+#include "te_uloggermclperfstep.h"
+#include "te_uloggerfilepluginstep.h"
+#include "te_uloggerserialpluginstep.h"
+#include "te_uloggerbuffersizingstep.h"
+#include "te_uloggerbuffermodestep.h"
+#include "te_uloggerclearconfigstep.h"
+#include "te_uloggerconfigfilestep.h"
+#include "te_uloggerfilepluginsteperr.h"
+
+
+_LIT(KServerName,"te_uloggermclsuite");
+CTe_ULoggerMCLSuite* CTe_ULoggerMCLSuite::NewL()
+/**
+ * @return - Instance of the test server
+ * Same code for Secure and non-secure variants
+ * Called inside the MainL() function to create and start the
+ * CTestServer derived server.
+ */
+	{
+	CTe_ULoggerMCLSuite * server = new (ELeave) CTe_ULoggerMCLSuite();
+	CleanupStack::PushL(server);
+
+	server->ConstructL(KServerName);
+	CleanupStack::Pop(server);
+	return server;
+	}
+
+
+// Secure variants much simpler
+// For EKA2, just an E32Main and a MainL()
+LOCAL_C void MainL()
+/**
+ * Secure variant
+ * Much simpler, uses the new Rendezvous() call to sync with the client
+ */
+	{
+	// Leave the hooks in for platform security
+#if (defined __DATA_CAGING__)
+	RProcess().DataCaging(RProcess::EDataCagingOn);
+	RProcess().DataCaging(RProcess::ESecureApiOn);
+#endif
+	CActiveScheduler* sched=NULL;
+	sched=new(ELeave) CActiveScheduler;
+	CActiveScheduler::Install(sched);
+	CTe_ULoggerMCLSuite* server = NULL;
+	// Create the CTestServer derived server
+	TRAPD(err,server = CTe_ULoggerMCLSuite::NewL());
+	if(!err)
+		{
+		// Sync with the client and enter the active scheduler
+		RProcess::Rendezvous(KErrNone);
+		sched->Start();
+		}
+	delete server;
+	delete sched;
+	}
+
+
+
+GLDEF_C TInt E32Main()
+/**
+ * @return - Standard Epoc error code on process exit
+ * Secure variant only
+ * Process entry point. Called by client using RProcess API
+ */
+	{
+	__UHEAP_MARK;
+	CTrapCleanup* cleanup = CTrapCleanup::New();
+	if(cleanup == NULL)
+		{
+		return KErrNoMemory;
+		}
+	TRAPD(err,MainL());
+	delete cleanup;
+	__UHEAP_MARKEND;
+	return err;
+    }
+
+
+CTestStep* CTe_ULoggerMCLSuite::CreateTestStep(const TDesC& aStepName)
+/**
+ * @return - A CTestStep derived instance
+ * Secure and non-secure variants
+ * Implementation of CTestServer pure virtual
+ */
+	{
+	CTestStep* testStep = NULL;
+	//API functionality tests
+              if(aStepName == KULoggerAPIPrimTestStep)
+                            testStep = new CULoggerAPIPrimTestStep();
+              else if(aStepName == KULoggerAPISecondTestStep)
+                            testStep = new CULoggerAPISecondTestStep();
+              else if(aStepName == KULoggerAPILoggingTestStep)
+                            testStep = new CULoggerAPILoggingTestStep();
+              else if(aStepName == KULoggerAPIKernelTestStep)
+                            testStep = new CULoggerAPIKernelTestStep();
+              else if(aStepName == KULoggerAPIPrintfTestStep)
+                            testStep = new CULoggerAPIPrintfTestStep();
+              else if(aStepName == KULoggerAPIKernelPrintfTestStep)
+                            testStep = new CULoggerAPIKernelPrintfTestStep();
+              else if(aStepName == KULoggerFilePluginStep)
+                            testStep = new CULoggerFilePluginStep();
+              else if(aStepName == KULoggerSerialPluginStep)
+                            testStep = new CULoggerSerialPluginStep();
+	          else if(aStepName == KULoggerBufferSizingStep)
+                            testStep = new CULoggerBufferSizingStep();
+              else if(aStepName == KULoggerBufferModeStep)
+                            testStep = new CULoggerBufferModeStep();
+              else if(aStepName == KULoggerClearConfigStep)
+                            testStep = new CULoggerClearConfigStep();
+              else if(aStepName == KULoggerPublicConfigFileTestStep)
+               	    	    testStep = new CULoggerPublicConfigFileTestStep();
+              else if(aStepName == KULoggerPrivateConfigFileTestStep)
+                            testStep = new CULoggerPrivateConfigFileTestStep();
+              //negative tests (error code returned from an ulogger plugin) - server shouldn't panic
+              else if(aStepName == KULoggerFilePluginStepErr)
+            	  			testStep = new CULoggerFilePluginStepErr();
+	 //Performance tests
+              else if(aStepName == KULoggerMCLUserPerfStep)
+                            testStep = new CULoggerMCLUserPerfStep();
+              else if(aStepName == KULoggerMCLKernelPerfStep)
+                            testStep = new CULoggerMCLKernelPerfStep();
+
+			 return testStep;
+	}