--- a/symbian3/mw/opensrv/package_definition.xml	Wed Dec 02 18:06:06 2009 +0000
+++ b/symbian3/mw/opensrv/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
@@ -1,53 +1,109 @@
 <?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="mw" long-name="Middleware" levels="generic specific">
-<block name="opensrv" long-name="Open Services" tech_domain="pr" level="specific" levels="prt lib server eng">
-    <collection name="loudmouth" long-name="Loudmouth" level="prt">
-     <component name="loudmouth_build" origin-model="foundation">
-      <unit bldFile="/sf/mw/opensrv/loudmouth/group"/>
-     </component>
-     <component unofficial="yes" name="loudmouth_test" long-name="Loudmouth Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/opensrv/loudmouth/tsrc/group"/> -->
-     </component>
-    </collection>
-    <collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-     <component name="libtelepathy_build" origin-model="foundation">
-      <unit bldFile="/sf/mw/opensrv/libtelepathy/group"/>
-     </component>
-     <component unofficial="yes" name="libtelepathy_test" long-name="Telepathy Library Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/opensrv/libtelepathy/tsrc/group"/> -->
-     </component>
-    </collection>
-    <collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-     <component unofficial="yes" name="telepathygabble_build" long-name="Telepathy Gabble Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/opensrv/telepathygabble/group"/>
-     </component>
-    </collection>
-    <collection name="isolationserver" long-name="Isloation Server" level="server">
-     <component name="messagequeue" long-name="Message Queue" origin-model="foundation">
-      <unit bldFile="/sf/mw/opensrv/isolationserver/messagequeue/group"/>
-     </component>
-     <component name="isoserver" long-name="ISO Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/opensrv/isolationserver/isoserver/group"/>
-     </component>
-     <component unofficial="yes" name="isolationserver_test" long-name="Isloation Server Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/opensrv/isolationserver/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="isolationserver_build" long-name="Isloation Server Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/opensrv/isolationserver/group"/>
-     </component>
-    </collection>
-    <collection name="opensrv_info" long-name="Open Services Info" level="eng">
-     <component unofficial="yes" name="opensrv_plat" long-name="Open Services Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/opensrv/opensrv_plat/group"/>
-      <!-- <unit bldFile="/sf/mw/opensrv/opensrv_plat/messagequeue_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="opensrv_build" long-name="Open Services Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/opensrv/group"/>
-     </component>
-    </collection>
-   </block>
+<layer name="mw">
+<block name="opensrv">
+<collection name="s60">
+<component name="opensrv">
+<unit bldFile="/sf/mw/opensrv/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>