diff -r 1553c141c99f -r 5dfc4b38cad0 3k/os/textandloc/package_definition.xml
--- a/3k/os/textandloc/package_definition.xml	Mon Jul 27 18:33:03 2009 +0100
+++ b/3k/os/textandloc/package_definition.xml	Tue Jul 28 14:16:28 2009 +0100
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="Foundation" schema="2.0.1">
+<SystemDefinition name="foundation" schema="2.0.1">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
 <block name="textandloc" long-name="Text and Localisation" tech_domain="ui" level="services" levels="encoding util fonts tools text">
     <collection name="charconvfw" long-name="Character Conversion FW" level="encoding">
-     <component name="charconv" long-name="Charconv" origin-model="Foundation">
+     <component name="charconv" long-name="Charconv" origin-model="foundation">
       <unit bldFile="/sf/os/textandloc/charconvfw/charconv/ongoing/group"/>
      </component>
-     <component name="charconvplugin" long-name="Charconv Plugin" origin-model="Foundation">
+     <component name="charconvplugin" long-name="Charconv Plugin" origin-model="foundation">
       <unit bldFile="/sf/os/textandloc/charconvfw/charconvplugin/group"/>
      </component>
-     <component name="charconv_fw" origin-model="Foundation" long-name="Character Encoding and Conversion Framework" purpose="optional" plugin="N">
+     <component name="charconv_fw" origin-model="foundation" long-name="Character Encoding and Conversion Framework" purpose="optional" plugin="N">
       <unit bldFile="/sf/os/textandloc/charconvfw/charconv_fw/group" mrp="/sf/os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
      </component>
      <!--Component manually removed and merged to OS-->
@@ -36,13 +36,15 @@
       <unit bldFile="/sf/os/textandloc/fontservices/freetypefontrasteriser/group" mrp="/sf/os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
      </component>
      <component name="n:itypefontrasteriser" long-name="iType Font Rasteriser" filter="gt" introduced="tb92" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/fbs/itypefontrasteriser/group" mrp="/sf/os/graphics/fbs/itypefontrasteriser/group/graphics_itype.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/graphics/fbs/itypefontrasteriser/group" mrp="os/graphics/fbs/itypefontrasteriser/group/graphics_itype.mrp"/> -->
      </component>
      <component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/textandloc/fontservices/referencefonts/group" mrp="/sf/os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
      </component>
      <component name="n:testfonts" long-name="Test Fonts" filter="gt" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/textandloc/fontservices/graphicstestfonts/group" mrp="/sf/os/textandloc/fontservices/graphicstestfonts/group/graphics_testfonts.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/textandloc/fontservices/graphicstestfonts/group" mrp="os/textandloc/fontservices/graphicstestfonts/group/graphics_testfonts.mrp"/> -->
      </component>
     </collection>
     <collection name="textlayout" long-name="Text Layout" level="text">
@@ -57,28 +59,28 @@
      </component>
     </collection>
     <collection name="textandlocutils" level="util" long-name="Text and Localisation Utils">
-     <component name="Localizer" long-name="Localizer" origin-model="Foundation">
+     <component name="localizer" long-name="Localizer" origin-model="foundation">
       <unit bldFile="/sf/os/textandloc/charconvfw/localizer/group"/>
      </component>
-     <component name="Findutil" long-name="Find Util" origin-model="Foundation">
+     <component name="findutil" long-name="Find Util" origin-model="foundation">
       <unit bldFile="/sf/os/textandloc/charconvfw/findutil/group"/>
      </component>
-     <component name="numbergrouping" long-name="Number Grouping" origin-model="Foundation">
+     <component name="numbergrouping" long-name="Number Grouping" origin-model="foundation">
       <unit bldFile="/sf/os/textandloc/charconvfw/numbergrouping/group"/>
      </component>
-     <component name="gamerecognizer" long-name="Game Recognizer" origin-model="Foundation">
+     <component name="gamerecognizer" long-name="Game Recognizer" origin-model="foundation">
       <unit bldFile="/sf/os/textandloc/charconvfw/gamerecognizer/group"/>
      </component>
-     <component name="JPLangUtil" long-name="JP Lang Util" origin-model="Foundation">
+     <component name="jplangutil" long-name="JP Lang Util" origin-model="foundation">
       <unit bldFile="/sf/os/textandloc/charconvfw/jplangutil/group"/>
      </component>
-     <component name="SortUtil" long-name="Sort Util" origin-model="Foundation">
+     <component name="sortutil" long-name="Sort Util" origin-model="foundation">
       <unit bldFile="/sf/os/textandloc/charconvfw/sortutil/group"/>
      </component>
-     <component name="AknJapaneseReading" long-name="Akn Japanese Reading" origin-model="Foundation">
+     <component name="aknjapanesereading" long-name="Akn Japanese Reading" origin-model="foundation">
       <unit bldFile="/sf/os/textandloc/charconvfw/aknjapanesereading/group"/>
      </component>
-     <component name="inlinetext" long-name="Inline Text" origin-model="Foundation">
+     <component name="inlinetext" long-name="Inline Text" origin-model="foundation">
       <unit bldFile="/sf/os/textandloc/charconvfw/inlinetext/group"/>
      </component>
     <component name="nearestlangutil" long-name="Nearest Language Util" introduced="tb91" purpose="mandatory" class="placeholder" plugin="N" origin-model="Symbian">
@@ -88,60 +90,39 @@
       <unit bldFile="/sf/os/textandloc/textrendering/numberformatting/group" mrp="/sf/os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
      </component>
     </collection>
-	<!-- Collection manually added from OS after auto-merge -->
-	<collection name="localesupport" long-name="Locale Support" level="util">
-	 <component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-	  <unit bldFile="/sf/os/kernelhwsrv/localisation/localesupport" mrp="/sf/os/kernelhwsrv/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-	 </component>
-	 <component name="initlocale" long-name="Initialise Locale" introduced="tb91" purpose="mandatory" class="placeholder">
-	  <!-- placeholder for split from bafl -->
-	 </component>
-	</collection>
-	<!-- Collection manually added from OS after auto-merge -->
-	<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-	 <component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-	  <!-- placeholder for split from GDI Tools -->
-	 </component>
-	 <component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-	  <unit bldFile="/sf/os/graphics/graphicstools/bitmapfonttools/group" mrp="/sf/os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-	 </component>
-	</collection>
-    <collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-     <component unofficial="yes" name="directory_localizer_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/textandloc/textandloc_pub/directory_localizer_api/group"/>
+    <collection name="localesupport" long-name="Locale Support" level="util">
+     <component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="/sf/os/kernelhwsrv/localisation/localesupport" mrp="/sf/os/kernelhwsrv/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
+     </component>
+     <component name="initlocale" long-name="Initialise Locale" introduced="tb91" purpose="mandatory" class="placeholder" plugin="N" origin-model="Symbian">
+      <!-- placeholder for split from bafl -->
      </component>
-     <component unofficial="yes" name="character_conversion_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/textandloc/textandloc_pub/character_conversion_api/group"/>
+    </collection>
+    <collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
+     <component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC" plugin="N" origin-model="Symbian">
+      <!-- placeholder for split from GDI Tools -->
      </component>
-     <component unofficial="yes" name="character_conversion_plugin_provider_api" origin-model="Foundation">
-      <!-- <unit bldFile="os/textandloc/textandloc_pub/character_conversion_plugin_provider_api/tsrc/group"/> -->
-      <unit bldFile="/sf/os/textandloc/textandloc_pub/character_conversion_plugin_provider_api/group"/>
+     <component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC" plugin="N" origin-model="Symbian">
+      <unit bldFile="/sf/os/graphics/graphicstools/bitmapfonttools/group" mrp="/sf/os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
      </component>
     </collection>
     <collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-     <component unofficial="yes" name="textandloc_build" long-name="Text and Localisation Build" origin-model="Foundation">
+     <component unofficial="yes" name="textandloc_pub" long-name="Text and Localisation Public Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="os/textandloc/textandloc_pub/character_conversion_plugin_provider_api/tsrc/group"/> -->
+      <unit bldFile="/sf/os/textandloc/textandloc_pub/group"/>
+     </component>
+     <component unofficial="yes" name="textandloc_build" long-name="Text and Localisation Build" origin-model="foundation">
       <unit bldFile="/sf/os/textandloc/group"/>
      </component>
+     <component unofficial="yes" name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="os/textandloc/textandloc_plat/findutil_api/tsrc/group"/> -->
+      <unit bldFile="/sf/os/textandloc/textandloc_plat/group"/>
+      <!-- <unit bldFile="os/textandloc/textandloc_plat/sortutil_api/tsrc/group"/> -->
+     </component>
     <component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-     <component unofficial="yes" name="findutil_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/textandloc/textandloc_plat/findutil_api/group"/>
-      <!-- <unit bldFile="os/textandloc/textandloc_plat/findutil_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="japanese_language_utilities_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="character_conversion_nonpublic_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/textandloc/textandloc_plat/character_conversion_nonpublic_api/group"/>
-     </component>
-     <component unofficial="yes" name="sortutil_api" origin-model="Foundation">
-      <!-- <unit bldFile="os/textandloc/textandloc_plat/sortutil_api/tsrc/group"/> -->
-      <unit bldFile="/sf/os/textandloc/textandloc_plat/sortutil_api/group"/>
-     </component>
-    </collection>
    </block>
 </layer>
 </systemModel>