diff -r 1553c141c99f -r 5dfc4b38cad0 3k/mw/wirelessacc/package_definition.xml
--- a/3k/mw/wirelessacc/package_definition.xml	Mon Jul 27 18:33:03 2009 +0100
+++ b/3k/mw/wirelessacc/package_definition.xml	Tue Jul 28 14:16:28 2009 +0100
@@ -1,58 +1,49 @@
 <?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="wirelessacc" long-name="Wireless Access" tech_domain="dc" level="specific" levels="framework generic ui">
     <collection name="hotspotfw" long-name="Hotspot Framework" level="framework">
-     <component name="hsserver" long-name="HotSpot Server" origin-model="Foundation"/>
-     <component name="hsclient" long-name="HS Client" origin-model="Foundation"/>
-     <component name="internetconnectivitytestservice" long-name="Internet Connectivity Test Service" origin-model="Foundation">
+     <component name="hsserver" long-name="HotSpot Server" origin-model="foundation"/>
+     <component name="hsclient" long-name="HS Client" origin-model="foundation"/>
+     <component name="internetconnectivitytestservice" long-name="Internet Connectivity Test Service" origin-model="foundation">
       <!-- <unit bldFile="mw/wirelessacc/hotspotfw/internetconnectivitytestservice/group"/> -->
      </component>
-     <component name="ictsdialogs" long-name="ICTS Dialogs" origin-model="Foundation">
+     <component name="ictsdialogs" long-name="ICTS Dialogs" origin-model="foundation">
       <!-- <unit bldFile="mw/wirelessacc/hotspotfw/ictsdialogs/group"/> -->
      </component>
-     <component name="hspluginforagent" long-name="HotSpot Plugin For Agent" origin-model="Foundation">
+     <component name="hspluginforagent" long-name="HotSpot Plugin For Agent" origin-model="foundation">
       <!-- <unit bldFile="mw/wirelessacc/hotspotfw/hspluginforagent/group"/> -->
      </component>
-     <component name="hsbrowser" long-name="HotSpot Browser" origin-model="Foundation">
+     <component name="hsbrowser" long-name="HotSpot Browser" origin-model="foundation">
       <!-- <unit bldFile="mw/wirelessacc/hotspotfw/hsbrowser/group"/> -->
      </component>
-     <component unofficial="yes" name="hotspotfw_build" long-name="Hotspot Framework Build" origin-model="Foundation">
+     <component unofficial="yes" name="hotspotfw_build" long-name="Hotspot Framework Build" origin-model="foundation">
       <unit bldFile="/sf/mw/wirelessacc/hotspotfw/group"/>
      </component>
     </collection>
     <collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-     <component name="wlanplugin" long-name="WLAN Plugin" origin-model="Foundation">
+     <component name="wlanplugin" long-name="WLAN Plugin" origin-model="foundation">
       <unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanplugin/group"/>
      </component>
-     <component name="wlansettingsui" long-name="WLAN Settings UI" origin-model="Foundation">
+     <component name="wlansettingsui" long-name="WLAN Settings UI" origin-model="foundation">
       <unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
      </component>
-     <component name="wlansniffer" long-name="WLAN Sniffer" origin-model="Foundation">
+     <component name="wlansniffer" long-name="WLAN Sniffer" origin-model="foundation">
       <unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlansniffer/group"/>
      </component>
-     <component name="wlanindicatorplugin" long-name="WLAN Indicator Plugin" origin-model="Foundation">
+     <component name="wlanindicatorplugin" long-name="WLAN Indicator Plugin" origin-model="foundation">
       <unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
      </component>
-     <component unofficial="yes" name="wlanutilities_build" long-name="WLAN Utilities Build" origin-model="Foundation">
+     <component unofficial="yes" name="wlanutilities_build" long-name="WLAN Utilities Build" origin-model="foundation">
       <unit bldFile="/sf/mw/wirelessacc/wlanutilities/group"/>
      </component>
     </collection>
     <collection name="wirelessacc_info" long-name="Wireless Access Info" level="ui">
-     <component unofficial="yes" name="hotspot_framework_client_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="hotspot_framework_client_plugin_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
+     <component unofficial="yes" name="hsfw_plat" class="api" origin-model="foundation">
+      <unit bldFile="/sf/mw/wirelessacc/hsfw_plat/group"/>
      </component>
-     <component unofficial="yes" name="internet_connectivity_test_service_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-     </component>
-     <component unofficial="yes" name="internet_connectivity_test_service_settings_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="wirelessacc_build" long-name="Wireless Access Build" origin-model="Foundation">
+     <component unofficial="yes" name="wirelessacc_build" long-name="Wireless Access Build" origin-model="foundation">
       <unit bldFile="/sf/mw/wirelessacc/group"/>
      </component>
     </collection>