--- a/symbian3/mw/wirelessacc/package_definition.xml Tue May 25 11:17:36 2010 +0100
+++ b/symbian3/mw/wirelessacc/package_definition.xml Wed May 26 17:18:20 2010 +0100
@@ -1,139 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
- <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="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 schema="3.0.0">
+ <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>