diff -r 4469f26a2533 -r a44ae815a47f CompilerCompatibility/os/textandloc/package_definition.xml
--- a/CompilerCompatibility/os/textandloc/package_definition.xml	Wed Apr 21 18:29:51 2010 +0100
+++ b/CompilerCompatibility/os/textandloc/package_definition.xml	Tue May 18 16:26:09 2010 +0100
@@ -54,92 +54,102 @@
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
 <block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-    <collection name="charconvfw" long-name="Character Conversion" level="encoding">
-     <component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-      <unit bldFile="/sf/os/textandloc/charconvfw/charconv_fw/group" mrp="/sf/os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-     </component>
-     <component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-      <unit bldFile="/sf/os/textandloc/charconvfw/charconvplugins/group" mrp="/sf/os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-     </component>
-     <component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-      <unit bldFile="/sf/os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="/sf/os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-     </component>
-    </collection>
-    <collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-     <component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-      <unit bldFile="/sf/os/textandloc/fontservices/textshaperplugin/group" mrp="/sf/os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-     </component>
-     <component name="fontstore" long-name="Font Store" purpose="mandatory">
-      <unit bldFile="/sf/os/textandloc/fontservices/fontstore/group" mrp="/sf/os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-     </component>
-     <component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-      <!-- placeholder for text code from GDI -->
-     </component>
-     <component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-      <unit bldFile="/sf/os/textandloc/fontservices/freetypefontrasteriser/group" mrp="/sf/os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-     </component>
-     <component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-      <unit bldFile="/sf/os/textandloc/fontservices/referencefonts/group" mrp="/sf/os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-     </component>
-    </collection>
-    <collection name="textlayout" long-name="Text Layout" level="text">
-     <component name="texthandling" long-name="Text Handling" purpose="optional">
-      <unit bldFile="/sf/os/textandloc/textrendering/texthandling/group" mrp="/sf/os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-     </component>
-     <component name="textformatting" long-name="Text Formatting" purpose="optional">
-      <unit bldFile="/sf/os/textandloc/textrendering/textformatting/group" mrp="/sf/os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-     </component>
-    </collection>
-    <collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-     <!-- components in this collection need to be moved to the right collection.
+<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
+<component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
+<unit bldFile="/sf/os/textandloc/textandloc_plat/findutil_api/group"/>
+</component>
+<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
+<unit bldFile="/sf/os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
+</component>
+<component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
+<unit bldFile="/sf/os/textandloc/textandloc_plat/sortutil_api/group"/>
+</component>
+</collection>
+<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
+<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
+<unit bldFile="/sf/os/textandloc/textandloc_pub/directory_localizer_api/group"/>
+</component>
+</collection>
+<collection name="charconvfw" long-name="Character Conversion" level="encoding">
+<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
+<unit bldFile="/sf/os/textandloc/charconvfw/charconv_fw/group" mrp="/sf/os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
+</component>
+<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
+<unit bldFile="/sf/os/textandloc/charconvfw/charconvplugins/group" mrp="/sf/os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
+</component>
+<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
+<unit bldFile="/sf/os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="/sf/os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
+</component>
+</collection>
+<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
+<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
+<unit bldFile="/sf/os/textandloc/fontservices/textshaperplugin/group" mrp="/sf/os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
+</component>
+<component name="fontstore" long-name="Font Store" purpose="mandatory">
+<unit bldFile="/sf/os/textandloc/fontservices/fontstore/group" mrp="/sf/os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
+</component>
+<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
+<!-- placeholder for text code from GDI -->
+</component>
+<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
+<unit bldFile="/sf/os/textandloc/fontservices/freetypefontrasteriser/group" mrp="/sf/os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
+</component>
+<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
+<unit bldFile="/sf/os/textandloc/fontservices/referencefonts/group" mrp="/sf/os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
+</component>
+</collection>
+<collection name="textlayout" long-name="Text Layout" level="text">
+<component name="texthandling" long-name="Text Handling" purpose="optional">
+<unit bldFile="/sf/os/textandloc/textrendering/texthandling/group" mrp="/sf/os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
+</component>
+<component name="textformatting" long-name="Text Formatting" purpose="optional">
+<unit bldFile="/sf/os/textandloc/textrendering/textformatting/group" mrp="/sf/os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
+</component>
+</collection>
+<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
+<!-- components in this collection need to be moved to the right collection.
     		Either move into the units' directories, or create a new textandlocutils directory -->
-     <component name="numbergrouping" filter="s60" long-name="Number Grouping">
-      <unit bldFile="/sf/os/textandloc/charconvfw/numbergrouping/group"/>
-     </component>
-     <component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
-      <unit bldFile="/sf/os/textandloc/charconvfw/jplangutil/group"/>
-     </component>
-     <component name="sortutil" filter="s60" long-name="Sorting Utility">
-      <unit bldFile="/sf/os/textandloc/charconvfw/sortutil/group"/>
-     </component>
-     <component name="inlinetext" filter="s60" long-name="Inline Text">
-      <unit bldFile="/sf/os/textandloc/charconvfw/inlinetext/group"/>
-     </component>
-     <component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-      <!-- placeholder for split from bafl -->
-     </component>
-     <component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-      <unit bldFile="/sf/os/textandloc/textrendering/numberformatting/group" mrp="/sf/os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-     </component>
-    </collection>
-    <collection name="localesupport" long-name="Locale Support" level="util">
-     <component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-      <unit bldFile="/sf/os/textandloc/localisation/localesupport" mrp="/sf/os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-     </component>
-     <component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
-      <!-- placeholder for split from bafl -->
-     </component>
-    </collection>
-    <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_info" long-name="Text and Localisation Info" level="text">
-     <component name="textandloc_pub" filter="s60" long-name="Text and Localisation Public Interfaces" class="api">
-      <unit bldFile="/sf/os/textandloc/textandloc_pub/group"/>
-     </component>
-     <component name="textandloc_plat" filter="s60" long-name="Text and Localisation Platform Interfaces" class="api">
-      <unit bldFile="/sf/os/textandloc/textandloc_plat/group"/>
-     </component>
-     <component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
-      <unit mrp="/sf/os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
+<component name="numbergrouping" filter="s60" long-name="Number Grouping">
+<unit bldFile="/sf/os/textandloc/charconvfw/numbergrouping/group"/>
+</component>
+<component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
+<unit bldFile="/sf/os/textandloc/charconvfw/jplangutil/group"/>
+</component>
+<component name="sortutil" filter="s60" long-name="Sorting Utility">
+<unit bldFile="/sf/os/textandloc/charconvfw/sortutil/group"/>
+</component>
+<component name="inlinetext" filter="s60" long-name="Inline Text">
+<unit bldFile="/sf/os/textandloc/charconvfw/inlinetext/group"/>
+</component>
+<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
+<!-- placeholder for split from bafl -->
+</component>
+<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
+<unit bldFile="/sf/os/textandloc/textrendering/numberformatting/group" mrp="/sf/os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
+</component>
+</collection>
+<collection name="localesupport" long-name="Locale Support" level="util">
+<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
+<unit bldFile="/sf/os/textandloc/localisation/localesupport" mrp="/sf/os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
+</component>
+<component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
+<!-- placeholder for split from bafl -->
+</component>
+</collection>
+<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_info" long-name="Text and Localisation Info" level="text">
+<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="/sf/os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file