--- a/package_definition.xml	Tue Oct 19 14:23:03 2010 +0800
+++ b/package_definition.xml	Wed Oct 20 12:04:53 2010 +0800
@@ -2,10 +2,12 @@
 <SystemDefinition schema="3.0.0">
  <package id="usb" name="USB" levels="adaptation hw-if plugin framework server app-if">
   <collection id="usb_plat" name="USB Platform Interfaces" level="app-if">
-	<!-- placeholder for platform APIs -->
+      <component id="usb_shai_api" name="USB SHAI API" class="api" introduced="^4">
+       <unit bldFile="usb_plat/usb_shai_api/group"/>
+      </component>
   </collection>
   <collection id="usbdrv" name="USB Device Drivers" level="hw-if">
-	 	<component id="peripheraldrv" name="Usb peripheral driver" purpose="optional">
+	 	<component id="peripheraldrv" name="USB Peripheral Driver" purpose="optional">
   		<unit version="1" bldFile="usbdrv/peripheral/group" mrp="usbdrv/peripheral/group/peripheral.mrp" /> 
   	</component>
   </collection>
@@ -16,14 +18,6 @@
    <component id="usbmgrtest" name="USB Manager Tests" introduced="7.0" purpose="development" filter="test">
     <unit version="2" mrp="usbmgmt/usbmgrtest/group/usb_test.mrp" bldFile="usbmgmt/usbmgrtest/group"/>
    </component>
-   <component id="usbclassandmgrdocs" name="USB Class and Manager Documentation" purpose="development" class="doc">
-    <unit mrp="usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-   </component>
-  </collection>
-  <collection id="usb_info" name="USB Info" level="app-if">
-   <component id="usb_metadata" name="USB Metadata" class="config" introduced="^3" purpose="development" target="desktop">
-    <unit mrp="usb_info/usb_metadata/usb_metadata.mrp"/>
-   </component>
   </collection>
  </package>
 </SystemDefinition>