--- a/CompilerCompatibility/mw/wirelessacc/package_definition.xml	Wed Apr 21 18:29:51 2010 +0100
+++ b/CompilerCompatibility/mw/wirelessacc/package_definition.xml	Tue May 18 16:26:09 2010 +0100
@@ -54,54 +54,63 @@
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
-    <collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
-     <component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
-      <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-     </component>
-     <component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
-      <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-     </component>
-     <component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
-      <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-      <!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-     </component>
-     <component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
-      <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-      <!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-     </component>
-     <component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
-      <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-      <!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-     </component>
-     <component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
-      <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-      <!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-     </component>
-     <component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
-      <!--  should break up this bld.inf into the above components, or collapse them all into a single component -->
-      <unit bldFile="/sf/mw/wirelessacc/hotspotfw/group"/>
-     </component>
-    </collection>
-    <collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-     <component name="wlanplugin" filter="s60" long-name="WLAN Plugin" plugin="Y">
-      <unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanplugin/group"/>
-     </component>
-     <component name="wlansettingsui" filter="s60" long-name="WLAN Settings UI">
-      <unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
-     </component>
-     <component name="wlansniffer" filter="s60" long-name="WLAN Sniffer">
-      <unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlansniffer/group"/>
-     </component>
-     <component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y">
-      <unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
-     </component>
-    </collection>
-    <collection name="wirelessacc_info" long-name="Wireless Access Info" level="ui">
-     <component name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" filter="s60" class="api">
-      <unit bldFile="/sf/mw/wirelessacc/hsfw_plat/group"/>
-     </component>
-    </collection>
-   </block>
+<collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
+<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
+<unit bldFile="/sf/mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
+</component>
+<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
+<unit bldFile="/sf/mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
+</component>
+<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
+<unit bldFile="/sf/mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
+</component>
+<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
+<unit bldFile="/sf/mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
+</component>
+</collection>
+<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
+<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
+<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+</component>
+<component name="hsclient" filter="s60" long-name="HotSpot Client" class="placeholder">
+<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+</component>
+<component name="internetconnectivitytestservice" filter="s60" long-name="Internet Connectivity Test Service" class="placeholder">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
+</component>
+<component name="ictsdialogs" filter="s60" long-name="Internet Connectivity Test Service Dialogs" deprecated="^3" class="placeholder">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
+</component>
+<component name="hspluginforagent" filter="s60" long-name="HotSpot Plugin for Agent" plugin="Y" class="placeholder">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
+</component>
+<component name="hsbrowser" filter="s60" long-name="HotSpot Browser" class="placeholder">
+<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+<!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
+</component>
+<component name="hotspotfw_build" filter="s60" long-name="Hotspot Framework Build">
+<!--  should break up this bld.inf into the above components, or collapse them all into a single component -->
+<unit bldFile="/sf/mw/wirelessacc/hotspotfw/group"/>
+</component>
+</collection>
+<collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
+<component name="wlanplugin" filter="s60" long-name="WLAN Plugin" plugin="Y">
+<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanplugin/group"/>
+</component>
+<component name="wlansettingsui" filter="s60" long-name="WLAN Settings UI">
+<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
+</component>
+<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer">
+<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlansniffer/group"/>
+</component>
+<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y">
+<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file