--- a/symbian3/os/wlan/package_definition.xml	Mon Mar 15 18:29:08 2010 +0000
+++ b/symbian3/os/wlan/package_definition.xml	Mon Mar 15 18:47:03 2010 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
+ <!ELEMENT SystemDefinition (systemModel)>
  <!ATTLIST SystemDefinition
   name CDATA #REQUIRED
   schema CDATA #REQUIRED>
@@ -49,71 +49,45 @@
   prebuilt NMTOKEN #IMPLIED
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
 <block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlanapitest" long-name="WLAN API Tests" level="test">
-<component name="wlanhaitest" long-name="WLAN HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/wlan/wlanapitest/wlanhaitest/group/wlanhaitest.mrp"/>
-</component>
-</collection>
-<collection name="wlan_info" long-name="WLAN Info" level="test">
-<component name="wlan_metadata" long-name="WLAN Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/wlan/wlan_info/wlan_metadata/wlan_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="wlan">
-<unit bldFile="/sf/os/wlan/group" mrp=""/>
-</component>
-</collection>
-</block>
+    <collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
+     <component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
+      <unit bldFile="/sf/os/wlan/wlan_bearer/wlanpsmplugin/group"/>
+     </component>
+     <component name="wlanagent" filter="s60" long-name="WLAN Agent">
+      <unit bldFile="/sf/os/wlan/wlan_bearer/wlanagent/group"/>
+     </component>
+     <component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
+      <unit bldFile="/sf/os/wlan/wlan_bearer/wlandbif_cd/group"/>
+     </component>
+     <!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
+     <component name="wlanengine" filter="s60" long-name="WLAN Engine">
+      <unit bldFile="/sf/os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
+     </component>
+     <component name="wlanldd" filter="s60" long-name="WLAN LDD">
+      <unit bldFile="/sf/os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
+     </component>
+     <component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
+      <unit bldFile="/sf/os/wlan/wlan_bearer/wlannwif/group"/>
+     </component>
+    </collection>
+    <collection name="wlanapitest" long-name="WLAN API Tests" level="test"/>
+    <collection name="wlan_info" long-name="WLAN Info" level="test">
+     <component name="wlan_pub" filter="s60" long-name="WLAN Public Interfaces" class="api">
+      <unit bldFile="/sf/os/wlan/wlan_pub/group"/>
+     </component>
+     <component name="wlan_plat" filter="s60" long-name="WLAN Platform Interfaces" class="api">
+      <unit bldFile="/sf/os/wlan/wlan_plat/group"/>
+     </component>
+     <component name="wlan_metadata" long-name="WLAN Metadata" introduced="^2" purpose="development" class="config PC">
+      <unit mrp="/sf/os/wlan/wlan_info/wlan_metadata/wlan_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file