--- a/3k/app/photos/package_definition.xml	Mon Jul 27 18:33:03 2009 +0100
+++ b/3k/app/photos/package_definition.xml	Tue Jul 28 14:16:28 2009 +0100
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="Foundation" schema="2.0.1">
+<SystemDefinition name="foundation" schema="2.0.1">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="photos" long-name="Photos" tech_domain="ma" level="apps" levels="support fw ui app">
     <collection name="photosgallery" long-name="Photos Gallery" level="app">
-     <component name="photosgallery_help" long-name="Help" origin-model="Foundation">
+     <component name="photosgallery_help" long-name="Help" origin-model="foundation">
       <unit bldFile="/sf/app/photos/photosgallery/help/group"/>
      </component>
-     <component name="logging" long-name="Logging" origin-model="Foundation">
+     <component name="logging" long-name="Logging" origin-model="foundation">
       <!-- <unit bldFile="app/photos/photosgallery/logging/app/group"/> -->
       <unit bldFile="/sf/app/photos/photosgallery/logging/group"/>
      </component>
-     <component name="photosgallery_common" long-name="Common" origin-model="Foundation">
+     <component name="photosgallery_common" long-name="Common" origin-model="foundation">
       <unit bldFile="/sf/app/photos/photosgallery/common/group"/>
      </component>
-     <component name="photosgallery_commonui" long-name="Common UI" origin-model="Foundation">
+     <component name="photosgallery_commonui" long-name="Common UI" origin-model="foundation">
       <unit bldFile="/sf/app/photos/photosgallery/commonui/group"/>
      </component>
-     <component name="collectionframework" long-name="Collection Framework" origin-model="Foundation">
+     <component name="photoscollectionfw" long-name="Collection Framework" origin-model="foundation">
       <unit bldFile="/sf/app/photos/photosgallery/collectionframework/group"/>
       <!-- <unit bldFile="app/photos/photosgallery/collectionframework/plugins/glxcollectionpluginalbums/group"/> -->
      </component>
-     <component name="viewframework" long-name="View Framework" origin-model="Foundation">
+     <component name="photosviewfw" long-name="View Framework" origin-model="foundation">
       <!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerbase/tsrc/group"/> -->
       <!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerupnp/tsrc/group"/> -->
       <!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerupnp/tsrc/t_glxupnprenderer/group"/> -->
@@ -38,59 +38,42 @@
       <!-- <unit bldFile="app/photos/photosgallery/viewframework/views/metadataview/group"/> -->
       <!-- <unit bldFile="app/photos/photosgallery/viewframework/views/viewbase/group"/> -->
      </component>
-     <component name="controllers" long-name="Controllers" origin-model="Foundation">
+     <component name="controllers" long-name="Controllers" origin-model="foundation">
       <unit bldFile="/sf/app/photos/photosgallery/controllers/group"/>
      </component>
-     <component name="gallery" long-name="Gallery" origin-model="Foundation">
+     <component name="photogallery" long-name="Gallery" origin-model="foundation">
       <unit bldFile="/sf/app/photos/photosgallery/gallery/group"/>
      </component>
-     <component name="slideshow" long-name="Slideshow" origin-model="Foundation">
+     <component name="slideshow" long-name="Slideshow" origin-model="foundation">
       <!-- <unit bldFile="app/photos/photosgallery/slideshow/engine/tsrc/group"/> -->
       <unit bldFile="/sf/app/photos/photosgallery/slideshow/group"/>
      </component>
-     <component name="contentharvesterplugin" long-name="Content Harvester Plugin" origin-model="Foundation">
+     <component name="contentharvesterplugin" long-name="Content Harvester Plugin" origin-model="foundation">
       <unit bldFile="/sf/app/photos/photosgallery/contentharvesterplugin/group"/>
      </component>
-     <component name="photossuite" long-name="Photos Suite" origin-model="Foundation">
+     <component name="photossuite" long-name="Photos Suite" origin-model="foundation">
       <unit bldFile="/sf/app/photos/photosgallery/photossuite/group"/>
      </component>
      <!--Component manually removed as empty and name conflicts with another component-->
      <!--<component name="memoryplugin" long-name="Memory Plugin">
        <unit bldFile="app/photos/photosgallery/memoryplugin/group"/>
      </component>-->
-     <component unofficial="yes" name="icons" origin-model="Foundation">
+     <component unofficial="yes" name="photosicons" origin-model="foundation">
       <unit bldFile="/sf/app/photos/photosgallery/icons"/>
      </component>
-     <component unofficial="yes" name="photosgallery_build" long-name="Photos Gallery Build" origin-model="Foundation">
+     <component unofficial="yes" name="photosgallery_build" long-name="Photos Gallery Build" origin-model="foundation">
       <unit bldFile="/sf/app/photos/photosgallery/group"/>
      </component>
     </collection>
     <collection name="photos_info" long-name="Photos Info" level="app">
-     <component unofficial="yes" name="photos_build" long-name="Photos Build" origin-model="Foundation">
-      <unit bldFile="/sf/app/photos/group"/>
-     </component>
-    </collection>
-    <collection name="photos_plat" long-name="Photos Platform Interfaces" level="app">
-     <component unofficial="yes" name="gallery_utilities_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/photos/photos_plat/gallery_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="collection_plugins_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/photos/photos_plat/collection_plugins_api/group"/>
-     </component>
-     <component unofficial="yes" name="controllers_collection_api" origin-model="Foundation">
+     <component unofficial="yes" name="photos_plat" long-name="Photos Platform Interfaces" class="api" origin-model="foundation">
       <!-- <unit bldFile="app/photos/photos_plat/controllers_collection_api/tsrc/ui_metadatadialog/group"/> -->
+      <!-- <unit bldFile="app/photos/photos_plat/controllers_collection_api/tsrc/ut_collectioninfo/group"/> -->
       <!-- <unit bldFile="app/photos/photos_plat/controllers_collection_api/tsrc/ut_collectionmanager/group"/> -->
-      <!-- <unit bldFile="app/photos/photos_plat/controllers_collection_api/tsrc/ut_collectioninfo/group"/> -->
-      <unit bldFile="/sf/app/photos/photos_plat/controllers_collection_api/group"/>
-     </component>
-     <component unofficial="yes" name="photos_plat_build" long-name="Photos Platform API Build" origin-model="Foundation">
       <unit bldFile="/sf/app/photos/photos_plat/group"/>
      </component>
-     <component unofficial="yes" name="slideshow_ui_constants_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/photos/photos_plat/slideshow_ui_constants_api/group"/>
-     </component>
-     <component unofficial="yes" name="views_metadatadialog_api" origin-model="Foundation">
-      <unit bldFile="/sf/app/photos/photos_plat/views_metadatadialog_api/group"/>
+     <component unofficial="yes" name="photos_build" long-name="Photos Build" origin-model="foundation">
+      <unit bldFile="/sf/app/photos/group"/>
      </component>
     </collection>
    </block>