--- a/symbian3/app/jrt/package_definition.xml	Wed Feb 17 12:59:32 2010 +0000
+++ b/symbian3/app/jrt/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
@@ -78,24 +78,29 @@
     <layer name="app" long-name="Applications" levels="services apps">
       <block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
         <collection name="java_stubs" long-name="Java Stubs" level="util">
-          <component name="javadrmutils" long-name="Java DRM Utils" filter="s60">
-            <unit bldFile="/sf/app/jrt/java_stubs/jrtdrmutils/group"/>
+          <!-- 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"/>-->
           </component>
-          <component name="javaenvinfo" long-name="Java Environment Info" filter="s60">
-            <unit bldFile="/sf/app/jrt/java_stubs/jrtenvinfo/group"/>
+          <component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
+            <!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
           </component>
-          <component name="javaregistry" filter="s60" long-name="Java Registry">
-            <unit bldFile="/sf/app/jrt/java_stubs/jrtregistry/clientserver/client/group"/>
+          <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" long-name="Java Stubs ROM">
+          <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="/sf/app/jrt/java_stubs/group"/>
+            <!--<unit bldFile="java_stubs/group"/>-->
           </component>
         </collection>
         <collection name="jrt_info" long-name="JRT Info" level="rt">
           <component name="jrt_plat" filter="s60" long-name="JRT Platform Interfaces" class="api">
             <unit bldFile="/sf/app/jrt/jrt_plat/group"/>
           </component>
+          <component name="jrt_build" filter="s60" long-name="JRT Build">
+            <!--  needed for __JAVA_STUBS condition -->
+            <unit bldFile="/sf/app/jrt/group"/>
+          </component>
         </collection>
       </block>
     </layer>