--- a/3k/mw/metadatasrv/package_definition.xml	Mon Jul 27 18:33:03 2009 +0100
+++ b/3k/mw/metadatasrv/package_definition.xml	Tue Jul 28 14:16:28 2009 +0100
@@ -1,55 +1,33 @@
 <?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="metadatasrv" long-name="Legacy Metadata Services" tech_domain="mm" level="specific" levels="plugin framework server generic specific">
     <collection name="contentlistingframework" long-name="Content Listing Framework" level="framework">
-     <component unofficial="yes" name="contentlistingframework_build" long-name="Content Listing Framework Build" origin-model="Foundation">
+     <component unofficial="yes" name="contentlistingframework_build" long-name="Content Listing Framework Build" origin-model="foundation">
       <unit bldFile="/sf/mw/metadatasrv/contentlistingframework/group"/>
      </component>
     </collection>
     <collection name="mediamanagementuis" long-name="Media Management UIs" level="server">
-     <component name="mediastylegrid" long-name="Media Style Grid" origin-model="Foundation">
+     <component name="mediastylegrid" long-name="Media Style Grid" origin-model="foundation">
       <unit bldFile="/sf/mw/metadatasrv/mediamanagementuis/mediastylegrid/group"/>
      </component>
     </collection>
     <collection name="mediamanagementutilities" long-name="Media Management utilities" level="generic">
-     <component name="mediafetch" long-name="Media Fetch" origin-model="Foundation">
+     <component name="mediafetch" long-name="Media Fetch" origin-model="foundation">
       <unit bldFile="/sf/mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
      </component>
     </collection>
-    <collection name="metadatasrv_plat" long-name="Legacy Metadata Services Platform Interfaces" level="specific">
-     <component unofficial="yes" name="metadatasrv_plat_build" long-name="Legacy Metadata Services Platform API Build" origin-model="Foundation">
+    <collection name="metadatasrv_info" long-name="Legacy Metadata Services Info" level="specific">
+     <component unofficial="yes" name="metadatasrv_plat" long-name="Legacy Metadata Services Platform Interfaces" class="api" origin-model="foundation">
       <unit bldFile="/sf/mw/metadatasrv/metadatasrv_plat/group"/>
      </component>
-     <component unofficial="yes" name="content_listing_framework_extended_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/metadatasrv/metadatasrv_plat/content_listing_framework_extended_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_fetch_implementation_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/metadatasrv/metadatasrv_plat/media_fetch_implementation_api/group"/>
-     </component>
-     <component unofficial="yes" name="content_listing_framework_collection_manager_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/metadatasrv/metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_style_grid_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/metadatasrv/metadatasrv_plat/media_style_grid_api/group"/>
+     <component unofficial="yes" name="metadatasrv_build" long-name="Legacy Metadata Services Build" origin-model="foundation">
+      <unit bldFile="/sf/mw/metadatasrv/group"/>
      </component>
-    </collection>
-    <collection name="metadatasrv_pub" long-name="Legacy Metadata Services Public Interfaces" level="specific">
-     <component unofficial="yes" name="content_listing_framework_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/metadatasrv/metadatasrv_pub/content_listing_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="metadatasrv_pub_build" long-name="Legacy Metadata Services Public API Build" origin-model="Foundation">
+     <component unofficial="yes" name="metadatasrv_pub" long-name="Legacy Metadata Services Public Interfaces" class="api" origin-model="foundation">
       <unit bldFile="/sf/mw/metadatasrv/metadatasrv_pub/group"/>
      </component>
-     <component unofficial="yes" name="media_fetch_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/metadatasrv/metadatasrv_pub/media_fetch_api/group"/>
-     </component>
-    </collection>
-    <collection name="metadatasrv_info" long-name="Legacy Metadata Services Info" level="specific">
-     <component unofficial="yes" name="metadatasrv_build" long-name="Legacy Metadata Services Build" origin-model="Foundation">
-      <unit bldFile="/sf/mw/metadatasrv/group"/>
-     </component>
     </collection>
    </block>
 </layer>