--- a/symbian4/mw/hb/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/hb/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,100 +1,24 @@
 <?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="hb" level="generic" long-name="Orbit" levels="engine test api">
-        <collection name="hb_info" long-name="Orbit Info" level="api">
-          <component name="hb_build" long-name="Orbit Build" introduced="^4">
-            <!-- should break this down into actual components -->
-            <unit bldFile="/sf/mw/hb/." proFile="hb.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-          </component>
-        </collection>
-        <collection name="hb_test" long-name="Orbit Test" level="test">
-          <component name="hb_fute" filter="hb_fute_app" long-name="Fute" introduced="^4">
-            <unit bldFile="/sf/mw/hb/tsrc/fute" proFile="fute.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-          </component>
-          <component name="hb_unit" filter="test,hb_unit_test,unit_test" long-name="HB Unit Tests" introduced="^4">
-            <unit bldFile="/sf/mw/hb/tsrc/unit" proFile="unit.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-          </component>
-          <component name="hb_test_resources" filter="test,hb_test_resources" long-name="Orbit Test Resources" introduced="^4">
-            <unit bldFile="/sf/mw/hb/tsrc/resources" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN" proFile="resources.pro"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+    <package id="hb" name="Orbit" levels="engine test api">
+    <collection id="hb_info" name="Orbit Info" level="api">
+     <component id="hb_build" name="Orbit Build" introduced="^4">
+		<!-- should break this down into actual components -->
+      <unit bldFile="." qt:proFile="hb.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
+     </component>
+    </collection>
+    <collection id="hb_test" name="Orbit Test" level="test">
+     <component id="hb_fute" filter="hb_fute_app" name="Fute" introduced="^4">
+      <unit bldFile="tsrc/fute"  qt:proFile="fute.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
+     </component>
+     <component id="hb_unit" filter="test,hb_unit_test,unit_test" name="HB Unit Tests" introduced="^4">
+      <unit bldFile="tsrc/unit" qt:proFile="unit.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
+     </component>
+     <component id="hb_test_resources" filter="test,hb_test_resources" name="Orbit Test Resources"  introduced="^4">
+      <unit bldFile="tsrc/resources" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN" qt:proFile="resources.pro"/>
+     </component>
+    </collection>
+   </package>
 </SystemDefinition>
+
+