diff -r 1553c141c99f -r 5dfc4b38cad0 3k/mw/inputmethods/package_definition.xml
--- a/3k/mw/inputmethods/package_definition.xml	Mon Jul 27 18:33:03 2009 +0100
+++ b/3k/mw/inputmethods/package_definition.xml	Tue Jul 28 14:16:28 2009 +0100
@@ -1,66 +1,66 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="Foundation" schema="2.0.1">
+<SystemDefinition name="foundation" schema="2.0.1">
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="inputmethods" long-name="Input Methods" tech_domain="ui" level="generic" levels="plugin engine framework">
     <collection name="textinput" long-name="Text Input" level="framework">
-     <component name="ptienginev2" long-name="PTI Engine V2" origin-model="Foundation">
+     <component name="ptienginev2" long-name="PTI Engine V2" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/textinput/ptienginev2/group"/>
      </component>
-     <component name="AknInputLanguage" long-name="Akn Input Language" origin-model="Foundation">
+     <component name="akninputlanguage" long-name="Akn Input Language" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/textinput/akninputlanguage/group"/>
      </component>
-     <component name="peninputarc" long-name="Pen Input Arc" origin-model="Foundation">
+     <component name="peninputarc" long-name="Pen Input Arc" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/textinput/peninputarc/group"/>
       <!-- <unit bldFile="mw/inputmethods/textinput/peninputarc/src/peninputserverapp"/> -->
       <!-- <unit bldFile="mw/inputmethods/textinput/peninputarc/utils/group"/> -->
      </component>
-     <component name="peninputcommonctrls" long-name="Pen Input Common Ctrls" origin-model="Foundation">
+     <component name="peninputcommonctrls" long-name="Pen Input Common Ctrls" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/textinput/peninputcommonctrls/group"/>
      </component>
-     <component name="peninputhwrboxcn" long-name="Pen Input Hardwarer Boxcn" origin-model="Foundation">
+     <component name="peninputhwrboxcn" long-name="Pen Input Hardwarer Boxcn" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/textinput/peninputhwrboxcn/group"/>
      </component>
-     <component name="peninputvkbcn" long-name="Pen Input Vkbcn" origin-model="Foundation">
+     <component name="peninputvkbcn" long-name="Pen Input Vkbcn" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/textinput/peninputvkbcn/group"/>
      </component>
-     <component name="peninputcommonlayout" long-name="Pen Input Common Layout" origin-model="Foundation">
+     <component name="peninputcommonlayout" long-name="Pen Input Common Layout" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/textinput/peninputcommonlayout/group"/>
      </component>
-     <component name="peninputgenerichwr" long-name="Pen Input Generic Hwr" origin-model="Foundation">
+     <component name="peninputgenerichwr" long-name="Pen Input Generic Hwr" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/textinput/peninputgenerichwr/group"/>
      </component>
-     <component name="peninputgenericvkb" long-name="Pen Input Generic Vkb" origin-model="Foundation">
+     <component name="peninputgenericvkb" long-name="Pen Input Generic Vkb" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/textinput/peninputgenericvkb/group"/>
      </component>
-     <component name="peninputcommonctrlsjp" long-name="Pen Input Common Ctrls Jp" origin-model="Foundation">
+     <component name="peninputcommonctrlsjp" long-name="Pen Input Common Ctrls Jp" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/textinput/peninputcommonctrlsjp/group"/>
      </component>
-     <component name="peninputhwrboxjp" long-name="Pen Input Hardwarer Boxjp" origin-model="Foundation">
+     <component name="peninputhwrboxjp" long-name="Pen Input Hardwarer Boxjp" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/textinput/peninputhwrboxjp/group"/>
      </component>
-     <component name="peninputvkbjp" long-name="Pen Input Vkbjp" origin-model="Foundation">
+     <component name="peninputvkbjp" long-name="Pen Input Vkbjp" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/textinput/peninputvkbjp/group"/>
      </component>
-     <component name="peninputgenericitut" long-name="Pen Input Generici Tut" origin-model="Foundation">
+     <component name="peninputgenericitut" long-name="Pen Input Generici Tut" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/textinput/peninputgenericitut/group"/>
      </component>
-     <component name="peninputhwrtrui" long-name="Pen Input Hardwarer Tr UI" origin-model="Foundation">
+     <component name="peninputhwrtrui" long-name="Pen Input Hardwarer Tr UI" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/textinput/peninputhwrtrui/group"/>
      </component>
-     <component name="peninputhwrfscn" long-name="Pen Input Hardwarer Fscn" origin-model="Foundation">
+     <component name="peninputhwrfscn" long-name="Pen Input Hardwarer Fscn" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/textinput/peninputhwrfscn/group"/>
      </component>
-     <component name="Matsutake" long-name="Matsutake" origin-model="Foundation"/>
-     <component unofficial="yes" name="textinput_build" long-name="Text Input Build" origin-model="Foundation">
+     <component name="matsutake" long-name="Matsutake" origin-model="foundation"/>
+     <component unofficial="yes" name="textinput_build" long-name="Text Input Build" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/textinput/group"/>
      </component>
-     <component unofficial="yes" name="gslangplugin" origin-model="Foundation">
+     <component unofficial="yes" name="gslangplugin" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/textinput/gslangplugin"/>
      </component>
     </collection>
     <collection name="fep" long-name="FEP" level="engine">
-     <component name="aknfep" long-name="AKN FEP" origin-model="Foundation">
+     <component name="aknfep" long-name="AKN FEP" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/fep/aknfep/group"/>
       <!-- <unit bldFile="mw/inputmethods/fep/aknfep/peninputplugins/peninputimeplugincn/group"/> -->
       <!-- <unit bldFile="mw/inputmethods/fep/aknfep/peninputplugins/peninputimeplugingeneric/group"/> -->
@@ -78,60 +78,26 @@
      </component>
     </collection>
     <collection name="inputmethods_info" long-name="Input Methods Info" level="framework">
-     <component unofficial="yes" name="inputmethods_build" long-name="Input Methods Build" origin-model="Foundation">
+     <component unofficial="yes" name="inputmethods_plat" long-name="Input Methods Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group"/> -->
+      <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/group"/>
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="inputmethods_build" long-name="Input Methods Build" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/group"/>
      </component>
+     <component unofficial="yes" name="inputmethods_pub" long-name="Input Methods Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/group"/>
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/tsrc/group"/> -->
+     </component>
     <component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="framework">
-     <component unofficial="yes" name="aknfep_status_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="ptiengine_indic_definitions_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="aknfep_settings_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="ptiengine_key_definations_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="ptiengine_hwr_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group"/>
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="aknfep_uiinterface_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group"/>
-     </component>
-     <component unofficial="yes" name="aknfep_definitions_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="pen_input_server_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/pen_input_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="aknfep_pen_support_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-     </component>
-    </collection>
-    <collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="framework">
-     <component unofficial="yes" name="input_language_info_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-     </component>
-     <component unofficial="yes" name="optical_character_recognition_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="ptiengine_iti_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-     </component>
-    </collection>
    </block>
 </layer>
 </systemModel>