--- a/symbian4/app/jrt/package_definition.xml	Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/jrt/package_definition.xml	Wed May 19 10:37:39 2010 +0100
@@ -88,26 +88,46 @@
             <unit bldFile="/sf/app/jrt/jrt_plat/java_debug_api/build"/>
           </component>
         </collection>
-        <collection name="java_stubs" long-name="Java Stubs" level="util">
-          <!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-          <component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-            <!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
+        <collection name="build_nativejava" long-name="Build Native Java">
+          <component name="nativejava" long-name="Build Native Java" filter="s60" introduced="^4">
+            <unit bldFile="/sf/app/jrt/build/nativejava" filter="!sf_build"/>
+            <unit bldFile="/sf/app/jrt/build/nativejava" filter="sf_build"/>
           </component>
-          <component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-            <!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
+        </collection>
+        <collection name="javacommons" long-name="Java Commons" level="generic">
+          <component name="javacommons_build" filter="s60" long-name="JRT Build">
+            <unit bldFile="/sf/app/jrt/javacommons" filter="!sf_build"/>
+            <unit bldFile="/sf/app/jrt/javacommons" filter="sf_build"/>
           </component>
-          <component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-            <!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-          </component>
-          <component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-            <!-- Remove the #includes and rename JRT ROM-->
-            <!--<unit bldFile="java_stubs/group"/>-->
+        </collection>
+        <collection name="javaruntimes" long-name="Java Runtimes" level="rt">
+          <component name="javaruntimes_build" filter="s60" long-name="JRT Build">
+            <unit bldFile="/sf/app/jrt/javaruntimes" filter="!sf_build"/>
+            <unit bldFile="/sf/app/jrt/javaruntimes" filter="sf_build"/>
           </component>
         </collection>
-        <collection name="jrt_info" long-name="JRT Info" level="rt">
-          <component name="jrt_build" filter="s60" long-name="JRT Build">
-            <!--  needed for __JAVA_STUBS condition -->
-            <unit bldFile="/sf/app/jrt/group"/>
+        <collection name="javauis" long-name="Java UIs" level="ui">
+          <component name="javauis_build" filter="s60" long-name="JRT Build">
+            <unit bldFile="/sf/app/jrt/javauis" filter="!sf_build"/>
+            <unit bldFile="/sf/app/jrt/javauis" filter="sf_build"/>
+          </component>
+        </collection>
+        <collection name="javamanager" level="generic">
+          <component name="javamanager_build" filter="s60" long-name="JRT Build">
+            <unit bldFile="/sf/app/jrt/javamanager" filter="!sf_build"/>
+            <unit bldFile="/sf/app/jrt/javamanager" filter="sf_build"/>
+          </component>
+        </collection>
+        <collection name="javatools" long-name="Java Tools" level="util">
+          <component name="javatools_build" filter="s60" long-name="JRT Build">
+            <unit bldFile="/sf/app/jrt/javatools" filter="!sf_build"/>
+            <unit bldFile="/sf/app/jrt/javatools" filter="sf_build"/>
+          </component>
+        </collection>
+        <collection name="javaextensions" long-name="Java Extensions" level="generic">
+          <component name="javaextensions_build" filter="s60" long-name="JRT Build">
+            <unit bldFile="/sf/app/jrt/javaextensions" filter="!sf_build"/>
+            <unit bldFile="/sf/app/jrt/javaextensions" filter="sf_build"/>
           </component>
         </collection>
       </block>