--- a/symbian4/mw/opensrv/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/opensrv/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,118 +1,40 @@
 <?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^4" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-        <collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-          <component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-            <unit bldFile="/sf/mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-          </component>
-        </collection>
-        <collection name="loudmouth" long-name="Loudmouth" level="prt">
-          <!-- collection is really a component so it needs to be moved down a directory -->
-          <component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-            <unit bldFile="/sf/mw/opensrv/loudmouth/group"/>
-          </component>
-        </collection>
-        <collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-          <!-- collection is really a component so it needs to be moved down a directory -->
-          <component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-            <unit bldFile="/sf/mw/opensrv/libtelepathy/group"/>
-          </component>
-        </collection>
-        <collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-          <!-- collection is really a component so it needs to be moved down a directory -->
-          <component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-            <unit bldFile="/sf/mw/opensrv/telepathygabble/group"/>
-          </component>
-        </collection>
-        <collection name="isolationserver" long-name="Isolation Server" level="server">
-          <component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-            <unit bldFile="/sf/mw/opensrv/isolationserver/messagequeue/group"/>
-          </component>
-          <component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-            <unit bldFile="/sf/mw/opensrv/isolationserver/isoserver/group"/>
-          </component>
-          <component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-            <!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-            <unit bldFile="/sf/mw/opensrv/isolationserver/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="opensrv" name="Open Services" levels="prt lib server eng">
+  <collection id="opensrv_plat" name="Open Services Platform Interfaces" level="eng">
+   <component id="messagequeue_api" name="Message Queue API" introduced="^2" class="api" filter="s60">
+    <unit bldFile="opensrv_plat/messagequeue_api/group"/>
+   </component>
+  </collection>
+  <collection id="loudmouth" name="Loudmouth" level="prt">
+   <!-- collection is really a component so it needs to be moved down a directory -->
+   <component id="loudmouth_build" filter="s60" name="Loudmouth Build" introduced="^2">
+    <unit bldFile="loudmouth/group"/>
+   </component>
+  </collection>
+  <collection id="libtelepathy" name="Telepathy Library" level="lib">
+   <!-- collection is really a component so it needs to be moved down a directory -->
+   <component id="libtelepathy_build" filter="s60" name="Telepathy Library Build" introduced="^2">
+    <unit bldFile="libtelepathy/group"/>
+   </component>
+  </collection>
+  <collection id="telepathygabble" name="Telepathy Gabble" level="eng">
+   <!-- collection is really a component so it needs to be moved down a directory -->
+   <component id="telepathygabble_build" filter="s60" name="Telepathy Gabble Build" introduced="^2">
+    <unit bldFile="telepathygabble/group"/>
+   </component>
+  </collection>
+  <collection id="isolationserver" name="Isolation Server" level="server">
+   <component id="messagequeue" filter="s60" name="Message Queue" introduced="^2">
+    <unit bldFile="isolationserver/messagequeue/group"/>
+   </component>
+   <component id="isoserver" filter="s60" name="ISO Server" introduced="^2">
+    <unit bldFile="isolationserver/isoserver/group"/>
+   </component>
+   <component id="isolationserver_build" filter="s60" name="Isloation Server Build" introduced="^2">
+    <!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
+    <unit bldFile="isolationserver/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>