--- a/3k/mw/mds/package_definition.xml	Mon Jul 27 18:33:03 2009 +0100
+++ b/3k/mw/mds/package_definition.xml	Tue Jul 28 14:16:28 2009 +0100
@@ -1,133 +1,108 @@
 <?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="mds" long-name="Metadata Services" tech_domain="mm" level="specific" levels="mgr eng server int">
     <collection name="clfwrapper" long-name="CLF Wrapper" level="int">
-     <component unofficial="yes" name="clfwrapper_build" long-name="CLF Wrapper Build" origin-model="Foundation">
+     <component unofficial="yes" name="clfwrapper_build" long-name="CLF Wrapper Build" origin-model="foundation">
       <unit bldFile="/sf/mw/mds/clfwrapper/group"/>
      </component>
     </collection>
     <collection name="contextengine" long-name="Context Engine" level="eng">
-     <component name="contextengine_plugins" long-name="Plugins" origin-model="Foundation">
+     <component name="contextengine_plugins" long-name="Plugins" origin-model="foundation">
       <unit bldFile="/sf/mw/mds/contextengine/plugins/group"/>
      </component>
-     <component unofficial="yes" name="contextengine_build" long-name="Context Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="contextengine_build" long-name="Context Engine Build" origin-model="foundation">
       <unit bldFile="/sf/mw/mds/contextengine/group"/>
      </component>
     </collection>
     <collection name="harvester" long-name="Harvester" level="eng">
-     <component name="blacklistclient" long-name="Blacklist Client" origin-model="Foundation">
+     <component name="blacklistclient" long-name="Blacklist Client" origin-model="foundation">
       <unit bldFile="/sf/mw/mds/harvester/blacklistclient/group"/>
      </component>
-     <component name="blacklistserver" long-name="Blacklist Server" origin-model="Foundation">
+     <component name="blacklistserver" long-name="Blacklist Server" origin-model="foundation">
       <unit bldFile="/sf/mw/mds/harvester/blacklistserver/group"/>
      </component>
-     <component name="harvester_common" long-name="Common" origin-model="Foundation">
+     <component name="harvester_common" long-name="Common" origin-model="foundation">
       <unit bldFile="/sf/mw/mds/harvester/common/group"/>
      </component>
-     <component name="composerplugins" long-name="Composer Plugins" origin-model="Foundation">
+     <component name="composerplugins" long-name="Composer Plugins" origin-model="foundation">
       <unit bldFile="/sf/mw/mds/harvester/composerplugins/group"/>
      </component>
-     <component name="harvesterplugins" long-name="Harvester Plugins" origin-model="Foundation">
+     <component name="harvesterplugins" long-name="Harvester Plugins" origin-model="foundation">
       <!-- <unit bldFile="mw/mds/harvester/harvesterplugins/audioplaylistplugin/group"/> -->
       <unit bldFile="/sf/mw/mds/harvester/harvesterplugins/group"/>
      </component>
-     <component name="monitorplugins" long-name="Monitor Plugins" origin-model="Foundation">
+     <component name="monitorplugins" long-name="Monitor Plugins" origin-model="foundation">
       <unit bldFile="/sf/mw/mds/harvester/monitorplugins/group"/>
      </component>
-     <component name="harvester_server" long-name="Server" origin-model="Foundation">
+     <component name="harvester_server" long-name="Server" origin-model="foundation">
       <unit bldFile="/sf/mw/mds/harvester/server/group"/>
      </component>
-     <component name="harvester_client" long-name="Client" origin-model="Foundation">
+     <component name="harvester_client" long-name="Client" origin-model="foundation">
       <unit bldFile="/sf/mw/mds/harvester/client/group"/>
      </component>
-     <component unofficial="yes" name="harvester_build" long-name="Harvester Build" origin-model="Foundation">
+     <component unofficial="yes" name="harvester_build" long-name="Harvester Build" origin-model="foundation">
       <unit bldFile="/sf/mw/mds/harvester/group"/>
      </component>
     </collection>
     <collection name="locationmanager" long-name="Location Manager" level="mgr">
-     <component name="locationtrail" long-name="Location Trail" origin-model="Foundation">
+     <component name="locationtrail" long-name="Location Trail" origin-model="foundation">
       <unit bldFile="/sf/mw/mds/locationmanager/locationtrail/group"/>
      </component>
-     <component name="locationmanager_server" long-name="Server" origin-model="Foundation">
+     <component name="locationmanager_server" long-name="Server" origin-model="foundation">
       <unit bldFile="/sf/mw/mds/locationmanager/server/group"/>
      </component>
-     <component name="locationmanager_client" long-name="Client" origin-model="Foundation">
+     <component name="locationmanager_client" long-name="Client" origin-model="foundation">
       <unit bldFile="/sf/mw/mds/locationmanager/client/group"/>
      </component>
-     <component unofficial="yes" name="locationmanager_build" long-name="Location Manager Build" origin-model="Foundation">
+     <component unofficial="yes" name="locationmanager_build" long-name="Location Manager Build" origin-model="foundation">
       <unit bldFile="/sf/mw/mds/locationmanager/group"/>
      </component>
     </collection>
     <collection name="metadataengine" long-name="Metadata Engine" level="eng">
-     <component name="metadataengine_common" long-name="Common" origin-model="Foundation">
+     <component name="metadataengine_common" long-name="Common" origin-model="foundation">
       <unit bldFile="/sf/mw/mds/metadataengine/common/group"/>
      </component>
-     <component name="metadataengine_server" long-name="Server" origin-model="Foundation">
+     <component name="metadataengine_server" long-name="Server" origin-model="foundation">
       <unit bldFile="/sf/mw/mds/metadataengine/server/group"/>
      </component>
-     <component name="metadataengine_client" long-name="Client" origin-model="Foundation">
+     <component name="metadataengine_client" long-name="Client" origin-model="foundation">
       <unit bldFile="/sf/mw/mds/metadataengine/client/group"/>
      </component>
-     <component unofficial="yes" name="metadataengine_build" long-name="Metadata Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="metadataengine_build" long-name="Metadata Engine Build" origin-model="foundation">
       <unit bldFile="/sf/mw/mds/metadataengine/group"/>
      </component>
     </collection>
     <collection name="watchdog" long-name="Watchdog" level="server">
-     <component name="mdswatchdog.exe=binary" origin-model="Foundation">
+     <component name="mdswatchdog" origin-model="foundation">
       <unit bldFile="/sf/mw/mds/watchdog/group"/>
      </component>
     </collection>
     <collection name="iadstoprestart" long-name="IAD Stop Restart" level="server">
-     <component unofficial="yes" name="iadstoprestart_build" long-name="IAD Stop Restart Build" origin-model="Foundation">
+     <component unofficial="yes" name="iadstoprestart_build" long-name="IAD Stop Restart Build" origin-model="foundation">
       <!-- <unit bldFile="mw/mds/iadstoprestart/group"/> -->
      </component>
     </collection>
-    <collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-     <component unofficial="yes" name="content_listing_framework_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/mds/mds_pub/content_listing_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="mds_pub_build" long-name="Metadata Services Public API Build" origin-model="Foundation">
-      <unit bldFile="/sf/mw/mds/mds_pub/group"/>
-     </component>
-    </collection>
     <collection name="mds_info" long-name="Metadata Services Info" level="int">
-     <component unofficial="yes" name="mds_build" long-name="Metadata Services Build" origin-model="Foundation">
-      <unit bldFile="/sf/mw/mds/group"/>
-     </component>
-    </collection>
-    <collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-     <component unofficial="yes" name="mds_plat_build" long-name="Metadata Services Platform API Build" origin-model="Foundation">
-      <unit bldFile="/sf/mw/mds/mds_plat/group"/>
+     <component unofficial="yes" name="mds_pub" long-name="Metadata Services Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="/sf/mw/mds/mds_pub/group"/>
      </component>
-     <component unofficial="yes" name="location_manager_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/mds/mds_plat/location_manager_api/group"/>
-      <!-- <unit bldFile="mw/mds/mds_plat/location_manager_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="harvester_framework_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/monitorplugintest/group"/> -->
-      <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/group"/>
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group"/> -->
+     <component unofficial="yes" name="mds_plat" long-name="Metadata Services Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/tsrc/group"/> -->
+      <unit bldFile="/sf/mw/mds/mds_plat/group"/>
       <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/composerplugintest/group"/> -->
       <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="content_listing_framework_extended_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-     </component>
-     <component unofficial="yes" name="content_listing_framework_collection_manager_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/mds/mds_plat/content_listing_framework_collection_manager_api/group"/>
-      <!-- <unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="metadata_engine_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/mds/mds_plat/metadata_engine_api/group"/>
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/monitorplugintest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/location_manager_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/mds/mds_plat/metadata_engine_api/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="context_engine_plugin_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/mds/mds_plat/context_engine_plugin_api/group"/>
+     <component unofficial="yes" name="mds_build" long-name="Metadata Services Build" origin-model="foundation">
+      <unit bldFile="/sf/mw/mds/group"/>
      </component>
     </collection>
    </block>