diff -r af20ebf91ca6 -r fcee787f22fe symbian4/app/jrt/package_definition_3.0.xml
--- a/symbian4/app/jrt/package_definition_3.0.xml	Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/jrt/package_definition_3.0.xml	Wed May 19 10:37:39 2010 +0100
@@ -1,41 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
  <package id="jrt" name="Java Runtime" levels="util generic rt ui">
   <collection id="jrt_plat" name="JRT Platform Interfaces" level="ui">
    <component id="java_registry_api" name="Java Registry API" class="api" filter="s60">
+    <meta rel="Api" href="jrt_plat/java_registry_api/java_registry_api.metaxml"/>
     <unit bldFile="jrt_plat/java_registry_api/build"/>
    </component>
    <component id="java_env_info_api" name="Java Environment Info API" class="api" filter="s60">
+    <meta rel="Api" href="jrt_plat/java_env_info_api/java_env_info_api.metaxml"/>
     <unit bldFile="jrt_plat/java_env_info_api/build"/>
    </component>
    <component id="java_debug_api" name="Java Debug API" class="api" filter="s60">
+    <meta rel="Api" href="jrt_plat/java_debug_api/java_debug_api.metaxml"/>
     <unit bldFile="jrt_plat/java_debug_api/build"/>
    </component>
   </collection>
-  <collection id="java_stubs" name="Java Stubs" level="util">
-   <meta rel="config">
-    <defined condition="__JAVA_STUBS"/>
-   </meta>
-   <!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-   <component id="javadrmutils" name="Java DRM Utils" filter="s60,sf_build">
-    <!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-   </component>
-   <component id="javaenvinfo" name="Java Environment Info" filter="s60,sf_build">
-    <!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-   </component>
-   <component id="javaregistry" filter="s60,sf_build" name="Java Registry">
-    <!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-   </component>
-   <component id="java_stubs_build" filter="s60,sf_build" name="Java Stubs ROM">
-    <!-- Remove the #includes and rename JRT ROM-->
-    <!--<unit bldFile="java_stubs/group"/>-->
+
+   <collection id="build_nativejava" name="Build Native Java">
+   <component id="nativejava"  name="Build Native Java" filter="s60" introduced="^4">
+      <unit bldFile="build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+      <unit bldFile="build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
    </component>
   </collection>
-  <collection id="jrt_info" name="JRT Info" level="rt">
-   <component id="jrt_build" filter="s60" name="JRT Build">
-    <!--  needed for __JAVA_STUBS condition -->
-    <unit bldFile="group"/>
-   </component>
+  <collection id="javacommons" name="Java Commons" level="generic">
+   <component id="javacommons_build" filter="s60" name="JRT Build">
+      <unit bldFile="javacommons" qt:proFile="javacommons.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+      <unit bldFile="javacommons" qt:proFile="javacommons.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+     </component>
+  </collection>
+  <collection id="javaruntimes" name="Java Runtimes" level="rt">
+   <component id="javaruntimes_build" filter="s60" name="JRT Build">
+      <unit bldFile="javaruntimes" qt:proFile="javaruntimes.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+      <unit bldFile="javaruntimes" qt:proFile="javaruntimes.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+     </component>
+  </collection>
+		<collection id="javauis" name="Java UIs" level="ui">
+   <component id="javauis_build" filter="s60" name="JRT Build">
+      <unit bldFile="javauis" qt:proFile="javauis.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+      <unit bldFile="javauis" qt:proFile="javauis.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+     </component>
+
+  </collection>
+		<collection id="javamanager" level="generic">
+   <component id="javamanager_build" filter="s60" name="JRT Build">
+      <unit bldFile="javamanager" qt:proFile="javamanager.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+      <unit bldFile="javamanager" qt:proFile="javamanager.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+     </component>
+  </collection>
+		<collection id="javatools" name="Java Tools" level="util">
+   <component id="javatools_build" filter="s60" name="JRT Build">
+      <unit bldFile="javatools" qt:proFile="javatools.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+      <unit bldFile="javatools" qt:proFile="javatools.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+     </component>
+  </collection>
+		<collection id="javaextensions" name="Java Extensions" level="generic">
+   <component id="javaextensions_build" filter="s60" name="JRT Build">
+      <unit bldFile="javaextensions" qt:proFile="javaextensions.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+      <unit bldFile="javaextensions" qt:proFile="javaextensions.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+     </component>
   </collection>
  </package>
 </SystemDefinition>