--- a/symbian3/mw/wirelessacc/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/wirelessacc/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,52 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="wirelessacc" name="Wireless Access" levels="framework generic ui">
-    <collection id="hotspotfw" name="HotSpot Framework" level="framework">
-      <component id="hsserver" filter="s60" name="HotSpot Server">
-      	<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-      </component>
-      <component id="hsclient" filter="s60" name="HotSpot Client">
-      	<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-      </component>
-      <component id="internetconnectivitytestservice" filter="s60" name="Internet Connectivity Test Service">
-      	<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-        <!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-      </component>
-      <component id="ictsdialogs" filter="s60" name="Internet Connectivity Test Service Dialogs" deprecated="^3">
-      	<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-        <!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-      </component>
-      <component id="hspluginforagent" filter="s60" name="HotSpot Plugin for Agent" class="plugin">
-      	<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-        <!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-      </component>
-      <component id="hsbrowser" filter="s60" name="HotSpot Browser">
-      	<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-        <!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-      </component>
-      <component id="hotspotfw_build" filter="s60" name="Hotspot Framework Build">
-      	<!--  should break up this bld.inf into the above components, or collapse them all into a single component -->
-        <unit bldFile="hotspotfw/group"/>
-      </component>
-    </collection>
-    <collection id="wlanutilities" name="WLAN Utilities" level="generic">
-      <component id="wlanplugin" filter="s60" name="WLAN Plugin" class="plugin">
-        <unit bldFile="wlanutilities/wlanplugin/group"/>
-      </component>
-      <component id="wlansettingsui" filter="s60" name="WLAN Settings UI">
-        <unit bldFile="wlanutilities/wlansettingsui/group"/>
-      </component>
-      <component id="wlansniffer" filter="s60" name="WLAN Sniffer">
-        <unit bldFile="wlanutilities/wlansniffer/group"/>
-      </component>
-      <component id="wlanindicatorplugin" filter="s60" name="WLAN Indicator Plugin" class="plugin">
-        <unit bldFile="wlanutilities/wlanindicatorplugin/group"/>
-      </component>
-    </collection>
-    <collection id="wirelessacc_info" name="Wireless Access Info" level="ui">
-      <component id="hsfw_plat" name="HotSpot Framework Platform Interfaces" filter="s60" class="api">
-        <unit bldFile="hsfw_plat/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="wirelessacc" name="Wireless Access" levels="framework generic ui">
+  <collection id="hsfw_plat" name="HotSpot Framework Platform Interfaces" level="ui">
+   <component id="hotspot_framework_client_api" name="HotSpot Framework Client API" class="api" filter="s60">
+    <meta rel="Api" href="hsfw_plat/hotspot_framework_client_api/hotspot_framework_client_api.metaxml"/>
+    <unit bldFile="hsfw_plat/hotspot_framework_client_api/group"/>
+   </component>
+   <component id="internet_connectivity_test_service_api" name="Internet Connectivity Test Service API" class="api" filter="s60">
+    <meta rel="Api" href="hsfw_plat/internet_connectivity_test_service_api/internet_connectivity_test_service_api.metaxml"/>
+    <unit bldFile="hsfw_plat/internet_connectivity_test_service_api/group"/>
+   </component>
+   <component id="internet_connectivity_test_service_settings_api" name="Internet Connectivity Test Service Settings API" class="api" filter="s60">
+    <meta rel="Api" href="hsfw_plat/internet_connectivity_test_service_settings_api/internet_connectivity_test_service_settings_api.metaxml"/>
+    <unit bldFile="hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
+   </component>
+   <component id="hotspot_framework_client_plugin_api" name="HotSpot Framework Client Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="hsfw_plat/hotspot_framework_client_plugin_api/hotspot_framework_client_plugin_api.metaxml"/>
+    <unit bldFile="hsfw_plat/hotspot_framework_client_plugin_api/group"/>
+   </component>
+  </collection>
+  <collection id="hotspotfw" name="HotSpot Framework" level="framework">
+   <component id="hsserver" filter="s60" name="HotSpot Server">
+    <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+   </component>
+   <component id="hsclient" filter="s60" name="HotSpot Client">
+    <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+   </component>
+   <component id="internetconnectivitytestservice" filter="s60" name="Internet Connectivity Test Service">
+    <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+    <!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
+   </component>
+   <component id="ictsdialogs" filter="s60" name="Internet Connectivity Test Service Dialogs" deprecated="^3">
+    <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+    <!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
+   </component>
+   <component id="hspluginforagent" filter="s60" name="HotSpot Plugin for Agent" class="plugin">
+    <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+    <!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
+   </component>
+   <component id="hsbrowser" filter="s60" name="HotSpot Browser">
+    <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+    <!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
+   </component>
+   <component id="hotspotfw_build" filter="s60" name="Hotspot Framework Build">
+    <!--  should break up this bld.inf into the above components, or collapse them all into a single component -->
+    <unit bldFile="hotspotfw/group"/>
+   </component>
+  </collection>
+  <collection id="wlanutilities" name="WLAN Utilities" level="generic">
+   <component id="wlanplugin" filter="s60" name="WLAN Plugin" class="plugin">
+    <unit bldFile="wlanutilities/wlanplugin/group"/>
+   </component>
+   <component id="wlansettingsui" filter="s60" name="WLAN Settings UI">
+    <unit bldFile="wlanutilities/wlansettingsui/group"/>
+   </component>
+   <component id="wlansniffer" filter="s60" name="WLAN Sniffer">
+    <unit bldFile="wlanutilities/wlansniffer/group"/>
+   </component>
+   <component id="wlanindicatorplugin" filter="s60" name="WLAN Indicator Plugin" class="plugin">
+    <unit bldFile="wlanutilities/wlanindicatorplugin/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>