--- a/CompilerCompatibility/app/imgeditor/package_definition.xml	Wed Apr 21 18:29:51 2010 +0100
+++ b/CompilerCompatibility/app/imgeditor/package_definition.xml	Tue May 18 16:26:09 2010 +0100
@@ -54,100 +54,112 @@
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="imgeditor" level="apps" long-name="Image Editor Apps" levels="engine ui">
-    <collection name="imageeditor" long-name="Image Editor UI" level="ui">
-     <component name="pb" filter="s60" long-name="Plugin Base">
-      <unit bldFile="/sf/app/imgeditor/imageeditor/pb/group"/>
-     </component>
-     <component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
-      <unit bldFile="/sf/app/imgeditor/imageeditor/iepb/group"/>
-     </component>
-     <component name="imageeditorui" filter="s60" long-name="Image Editor UI">
-      <unit bldFile="/sf/app/imgeditor/imageeditor/imageeditorui/group"/>
-     </component>
-     <component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
-      <unit bldFile="/sf/app/imgeditor/imageeditor/imageeditormanager/group"/>
-     </component>
-     <component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
-      <unit bldFile="/sf/app/imgeditor/imageeditor/imageeditorapp/group"/>
-     </component>
-     <component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
-      <!-- can only have one unit. Need to include all from a single bld.inf -->
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/textplugin/group"/>
-      <!-- conditionally #included in imageeditor_build: need to fix
+<collection name="imgeditor_plat" long-name="Image Editor Apps Platform Interfaces" level="ui">
+<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
+<unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
+</component>
+<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
+<unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
+</component>
+<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
+<unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
+</component>
+<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
+<unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
+</component>
+<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
+<unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
+</component>
+</collection>
+<collection name="imageeditor" long-name="Image Editor UI" level="ui">
+<component name="pb" filter="s60" long-name="Plugin Base">
+<unit bldFile="/sf/app/imgeditor/imageeditor/pb/group"/>
+</component>
+<component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
+<unit bldFile="/sf/app/imgeditor/imageeditor/iepb/group"/>
+</component>
+<component name="imageeditorui" filter="s60" long-name="Image Editor UI">
+<unit bldFile="/sf/app/imgeditor/imageeditor/imageeditorui/group"/>
+</component>
+<component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
+<unit bldFile="/sf/app/imgeditor/imageeditor/imageeditormanager/group"/>
+</component>
+<component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
+<unit bldFile="/sf/app/imgeditor/imageeditor/imageeditorapp/group"/>
+</component>
+<component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
+<!-- can only have one unit. Need to include all from a single bld.inf -->
+<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/cropplugin/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/drawplugin/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/frameplugin/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/textplugin/group"/>
+<!-- conditionally #included in imageeditor_build: need to fix
         <unit bldFile="imageeditor/plugins/drawplugin/group"/>
          -->
-     </component>
-     <component name="editorprovider" filter="s60" long-name="Image Editor Provider">
-      <unit bldFile="/sf/app/imgeditor/imageeditor/editorprovider/group"/>
-     </component>
-     <component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
-      <!-- should distribute this to the other components -->
-      <unit bldFile="/sf/app/imgeditor/imageeditor/group"/>
-     </component>
-    </collection>
-    <collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-     <component name="filters" filter="s60" long-name="Image Editor Filters">
-      <!-- can only have one unit. Need to include all from a single bld.inf -->
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-      <!-- conditionally #included in imageeditor_build: need to fix
+</component>
+<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
+<unit bldFile="/sf/app/imgeditor/imageeditor/editorprovider/group"/>
+</component>
+<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
+<!-- should distribute this to the other components -->
+<unit bldFile="/sf/app/imgeditor/imageeditor/group"/>
+</component>
+</collection>
+<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
+<component name="filters" filter="s60" long-name="Image Editor Filters">
+<!-- can only have one unit. Need to include all from a single bld.inf -->
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterframe/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filternegate/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterscale/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtertext/group"/>
+<!-- conditionally #included in imageeditor_build: need to fix
         <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
          -->
-     </component>
-     <component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-     </component>
-     <component name="systemparameters" filter="s60" long-name="System Parameters">
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/systemparameters/group"/>
-     </component>
-     <component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/enginewrapper/group"/>
-     </component>
-     <component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
-      <!-- should distribute this to the other components -->
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/group"/>
-     </component>
-    </collection>
-    <collection name="imgeditor_info" long-name="Image Editor Apps Info" level="ui">
-     <component name="imgeditor_plat" filter="s60" long-name="Image Editor Apps Platform Interfaces" class="api">
-      <unit bldFile="/sf/app/imgeditor/imgeditor_plat/group"/>
-     </component>
-    </collection>
-   </block>
+</component>
+<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/imageeditorutils/group"/>
+</component>
+<component name="systemparameters" filter="s60" long-name="System Parameters">
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/systemparameters/group"/>
+</component>
+<component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/enginewrapper/group"/>
+</component>
+<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
+<!-- should distribute this to the other components -->
+<unit bldFile="/sf/app/imgeditor/imageeditorengine/group"/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file