--- a/graphicstest/graphicstestharness/automation/graphicssystemgui.sysdef.xml	Tue Aug 31 16:31:06 2010 +0300
+++ b/graphicstest/graphicstestharness/automation/graphicssystemgui.sysdef.xml	Wed Sep 01 12:39:21 2010 +0100
@@ -89,6 +89,74 @@
 ]>
 <SystemDefinition name="MCL" schema="2.0.0">
 	<systemModel>
+		<layer name="Applications">
+			<block name="Techview">
+				<collection name="Test Apps">
+					<component name="Graphics Test Utilities">
+						<unit bldFile="sf\app\techview\testapps\graphicstestutils\group" mrp="sf\app\techview\testapps\graphicstestutils\group\graphics_testutils.mrp"/>
+					</component>
+				</collection>
+			</block>
+		</layer>
+		
+		<layer name="Middleware">
+			<block name="Generic Application Support">
+				<collection name="App Framework">
+					<component name="UIF Test Framework">
+						<unit bldFile="sf\mw\appsupport\appfw\uiftestfw\group" mrp="sf\mw\appsupport\appfw\uiftestfw\group\app-framework_testframework.mrp"/>
+					</component>
+				</collection>
+				<collection name="Printing Support">
+					<component name="Printing UI Support">
+						<unit bldFile="sf\mw\appsupport\printingsupport\printinguisupport\group" mrp="sf\mw\appsupport\printingsupport\printinguisupport\group\app-framework_print.mrp"/>		
+					</component>
+				</collection>
+			</block>
+			<block name="Classic UI">
+				<collection name="Common UI Support">
+					<component name="Error Resolver Data">
+						<unit bldFile="sf\mw\classicui\commonuisupport\errorresolverdata\group" mrp="sf\mw\classicui\commonuisupport\errorresolverdata\group\app-framework_errorresgt.mrp"/>
+					</component>
+					<component name="Grid">
+						<unit bldFile="sf\mw\classicui\commonuisupport\grid\group" mrp="sf\mw\classicui\commonuisupport\grid\group\app-framework_grid.mrp"/>
+					</component>
+					<component name="Uikon">
+						<unit bldFile="sf\mw\classicui\commonuisupport\uikon\group" mrp="sf\mw\classicui\commonuisupport\uikon\group\app-framework_uikon.mrp"/>
+					</component>
+					<component name="UI Look and Feel">
+						<unit bldFile="sf\mw\classicui\commonuisupport\uilaf\group" mrp="sf\mw\classicui\commonuisupport\uilaf\group\app-framework_uiklafgt.mrp"/>
+					</component>
+				</collection>
+				<collection name="Look and Feel Agnostic UI Foundation">
+					<component name="Animation">
+						<unit bldFile="sf\mw\classicui\lafagnosticuifoundation\animation\group" mrp="sf\mw\classicui\lafagnosticuifoundation\animation\group\app-framework_animation.mrp"/>
+					</component>
+					<component name="BMP Animation">
+						<unit bldFile="sf\mw\classicui\lafagnosticuifoundation\bmpanimation\group" mrp="sf\mw\classicui\lafagnosticuifoundation\bmpanimation\group\app-framework_bmpanim.mrp"/>
+					</component>
+					<component name="Clock">
+						<unit bldFile="sf\mw\classicui\lafagnosticuifoundation\clockanim\group" mrp="sf\mw\classicui\lafagnosticuifoundation\clockanim\group\app-framework_clock.mrp"/>
+					</component>
+					<component name="Cone">
+						<unit bldFile="sf\mw\classicui\lafagnosticuifoundation\cone\group" mrp="sf\mw\classicui\lafagnosticuifoundation\cone\group\app-framework_cone.mrp"/>
+					</component>
+					<component name="Graphics Effects">
+						<unit bldFile="sf\mw\classicui\lafagnosticuifoundation\graphicseffects\group" mrp="sf\mw\classicui\lafagnosticuifoundation\graphicseffects\group\app-framework_gfxtranseffect.mrp"/>
+					</component>
+					<component name="UI Graphics Utilities">
+						<unit bldFile="sf\mw\classicui\lafagnosticuifoundation\uigraphicsutils\group" mrp="sf\mw\classicui\lafagnosticuifoundation\uigraphicsutils\group\app-framework_egul.mrp"/>
+					</component>
+				</collection>
+			</block>
+			<block name="Input Methods">
+				<collection name="FEP">
+					<component name="Front End Processor">
+						<unit bldFile="sf\mw\inputmethods\fep\frontendprocessor\group" mrp="sf\mw\inputmethods\fep\frontendprocessor\group\app-framework_fepbase.mrp"/>
+					</component>
+				</collection>
+			</block>
+		</layer>
+		
 		<layer name="OS">
 			<block name="Graphics">
 				<collection name="EGL">
@@ -104,9 +172,6 @@
 					<component name="EGL Test">
 						<unit bldFile="sf\os\graphics\egl\egltest\group" mrp="sf\os\graphics\egl\egltest\group\graphics_egltest.mrp"/>
 					</component>
-					<component name="EGL Test Ext">
-						<unit bldFile="sf\os\graphics\egl\egltestext\group" mrp="sf\os\graphics\egl\egltestext\group\graphics_egltestext.mrp"/>
-					</component>
 					<component name="EGL Interface">
 						<unit bldFile="sf\os\graphics\egl\eglinterface\group" mrp="sf\os\graphics\egl\eglinterface\group\graphics_eglheaders.mrp"/>
 					</component>
@@ -121,7 +186,7 @@
 				</collection>
 				<collection name="Graphics Information">
 					<component name="Graphics Docs">
-						<unit base="sf\os\graphics\graphics_info\graphicsdocs"/>
+						<unit mrp="sf\os\graphics\graphics_info\graphicsdocs\graphics_documentation.mrp"/>
 					</component>
 				</collection>
 				<collection name="Graphics Composition">
@@ -146,12 +211,6 @@
 					<component name="OpenWF Composition Engine">
 						<unit bldFile="sf\os\graphics\graphicscomposition\openwfcompositionengine\group" mrp="sf\os\graphics\graphicscomposition\openwfcompositionengine\group\graphics_openwfcompositionengine.mrp"/>
 					</component>
-					<component name="OpenWF Composition Display Driver Adaptation for Display Channel">
-						<unit bldFile="sf\os\graphics\graphicscomposition\openwfc_ri_displaychannel\group" mrp="sf\os\graphics\graphicscomposition\openwfc_ri_displaychannel\group\graphics_openwfc_ri_displaychannel.mrp"/>
-					</component>            		
-					<component name="OpenWF Tests">
-						<unit bldFile="sf\os\graphics\graphicscomposition\openwftest\group" mrp="sf\os\graphics\graphicscomposition\openwftest\group\graphics_openwftest.mrp"/>
-					</component>            		
 				</collection>
 				<collection name="Graphics Device Interface">
 					<component name="BitGDI">
@@ -215,9 +274,6 @@
 					<component name="Common Graphics Headers">
 						<unit bldFile="sf\os\graphics\graphicsutils\commongraphicsheaders\group" mrp="sf\os\graphics\graphicsutils\commongraphicsheaders\group\graphics_commonheader.mrp"/>
 					</component>
-   				   <component id="graphics_tems" name="Graphics Template Extension Makefiles" introduced="^4" purpose="development" target="desktop" class="tool">
-        				<unit bldFile="graphicsutils/graphics_tems/group"/>
-      				</component>
 				</collection>
 				<collection name="OpenGLES">
 					<component name="OpenGLES Display Properties">
@@ -247,9 +303,6 @@
 					</component>
 				</collection>
 				<collection name="Windowing">
-					<component name="GCE Tfx Plugin">
-						<unit bldFile="sf\os\graphics\windowing\systemtfx\restricted\gcetfxplugin\group" mrp="sf\os\graphics\windowing\systemtfx\restricted\gcetfxplugin\group\graphics_tfx.mrp"/>
-					</component>				
 					<component name="Window Server">
 						<unit bldFile="sf\os\graphics\windowing\windowserver\group" mrp="sf\os\graphics\windowing\windowserver\group\graphics_wserv.mrp"/>
 					</component>
@@ -258,7 +311,7 @@
 					</component>
 				</collection>
 			</block>
-            		<block name="Text and Localisation">
+			<block name="Text and Localisation">
 				<collection name="Font Services">
 					<component name="Font Store">
 						<unit bldFile="sf\os\textandloc\fontservices\fontstore\group" mrp="sf\os\textandloc\fontservices\fontstore\group\graphics_fntstore.mrp"/>
@@ -272,6 +325,9 @@
 					<component name="Reference Fonts">
 						<unit bldFile="sf\os\textandloc\fontservices\referencefonts\group" mrp="sf\os\textandloc\fontservices\referencefonts\group\graphics_fonts.mrp"/>
 					</component>
+					<component name="Text Shaper Plugin">
+						<unit bldFile="sf\os\textandloc\fontservices\textshaperplugin\group" mrp="sf\os\textandloc\fontservices\textshaperplugin\group\graphics_iculayoutengine.mrp"/>
+					</component>
 				</collection>
 			</block>
 		</layer>