--- a/symbian3/app/webuis/package_definition.xml	Wed Dec 02 18:06:06 2009 +0000
+++ b/symbian3/app/webuis/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
@@ -1,54 +1,103 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (block*|collection*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT block (subblock*|collection*)*>
+ <!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT subblock (collection)*>
+ <!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT collection (component)*>
+ <!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED>
+ <!ELEMENT component (unit)*>
+ <!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>
+ <!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>
+ <!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">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="webuis" long-name="Web UIs" tech_domain="rt" level="services" levels="plugin app">
-    <collection name="browserui" long-name="Browser UI" level="app">
-     <component name="browser" long-name="Browser" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/browserui/browser/group"/>
-      <!-- <unit bldFile="/sf/app/webuis/browserui/browser/launcher2/group"/> -->
-     </component>
-     <component name="operatormenu" long-name="Operator Menu" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/browserui/operatormenu/group"/>
-     </component>
-     <component name="videoservices" long-name="Video Services" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/browserui/videoservices/group"/>
-     </component>
-     <component unofficial="yes" name="browserui_build" long-name="Browser UI Build" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/browserui/group"/>
-     </component>
-    </collection>
-    <collection name="browserplugins" long-name="Browser Plugins" level="plugin">
-     <component name="browsersysteminfoplugin" long-name="Browser System Info Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/browserplugins/browsersysteminfoplugin/group"/>
-     </component>
-     <component name="browsergpsplugin" long-name="Browser GPS Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/browserplugins/browsergpsplugin/group"/>
-     </component>
-     <component name="browseraudiovideoplugin" long-name="Browser Audio Video Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/browserplugins/browseraudiovideoplugin/group"/>
-     </component>
-     <component unofficial="yes" name="browserplugins_build" long-name="Browser Plugins Build" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/browserplugins/group"/>
-     </component>
-    </collection>
-    <collection name="pushmtm" long-name="Push MTM" level="plugin">
-     <component name="pushmtm_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/pushmtm/help/group"/>
-     </component>
-     <component name="plugins" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/pushmtm/plugins/group"/>
-     </component>
-     <component unofficial="yes" name="pushmtm_build" long-name="Push MTM Build" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/pushmtm/group"/>
-     </component>
-    </collection>
-    <collection name="webuis_info" long-name="Web UIs Info" level="app">
-     <component unofficial="yes" name="webuis_build" long-name="Web UIs Build" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/group"/>
-     </component>
-    </collection>
-   </block>
+<block name="webuis" level="services" long-name="Web UIs"/>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file