--- a/symbian4/app/jrt/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
+++ b/symbian4/app/jrt/package_definition.xml	Tue Sep 07 16:33:09 2010 +0100
@@ -50,66 +50,54 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="jrt" level="services" levels="util generic rt ui" long-name="Java Runtime">
+   <block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
 <collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" purpose="optional" class="api">
+<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
 <unit bldFile="/sf/app/jrt/jrt_plat/java_registry_api/build"/>
 </component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" purpose="optional" class="api">
+<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
 <unit bldFile="/sf/app/jrt/jrt_plat/java_env_info_api/build"/>
 </component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" purpose="optional" class="api">
+<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
 <unit bldFile="/sf/app/jrt/jrt_plat/java_debug_api/build"/>
 </component>
 </collection>
-<collection name="java_stubs" long-name="Java Stubs" level="rt">
-<component name="java_stubs_build" long-name="Build Native Java" introduced="^4" filter="sf_build" purpose="optional">
-<unit bldFile="/sf/app/jrt/java_stubs/group"/>
-</component>
-</collection>
 <collection name="build_nativejava" long-name="Build Native Java">
-<component name="nativejava" long-name="Build Native Java" introduced="^4" filter="s60" purpose="optional">
-<unit bldFile="/sf/app/jrt/build/nativejava" filter="!sf_build" proFile="nativejava.pro" qmakeArgs="-r"/>
-<unit bldFile="/sf/app/jrt/build/nativejava" filter="sf_build" proFile="nativejava.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+<component name="nativejava" long-name="Build Native Java" filter="s60" introduced="^4">
+<unit bldFile="/sf/app/jrt/build"/>
 </component>
 </collection>
 <collection name="javacommons" long-name="Java Commons" level="generic">
-<component name="javacommons_build" long-name="JRT Build" filter="s60" purpose="optional">
-<unit bldFile="/sf/app/jrt/javacommons" filter="!sf_build" proFile="javacommons.pro" qmakeArgs="-r"/>
-<unit bldFile="/sf/app/jrt/javacommons" filter="sf_build" proFile="javacommons.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+<component name="javacommons_build" filter="s60" long-name="Java Commons Build">
+<unit bldFile="/sf/app/jrt/javacommons" proFile="javacommons.pro"/>
 </component>
 </collection>
 <collection name="javaruntimes" long-name="Java Runtimes" level="rt">
-<component name="javaruntimes_build" long-name="JRT Build" filter="s60" purpose="optional">
-<unit bldFile="/sf/app/jrt/javaruntimes" filter="!sf_build" proFile="javaruntimes.pro" qmakeArgs="-r"/>
-<unit bldFile="/sf/app/jrt/javaruntimes" filter="sf_build" proFile="javaruntimes.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+<component name="javaruntimes_build" filter="s60" long-name="Java Runtimes Build">
+<unit bldFile="/sf/app/jrt/javaruntimes" proFile="javaruntimes.pro"/>
 </component>
 </collection>
 <collection name="javauis" long-name="Java UIs" level="ui">
-<component name="javauis_build" long-name="JRT Build" filter="s60" purpose="optional">
-<unit bldFile="/sf/app/jrt/javauis" filter="!sf_build" proFile="javauis.pro" qmakeArgs="-r"/>
-<unit bldFile="/sf/app/jrt/javauis" filter="sf_build" proFile="javauis.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+<component name="javauis_build" filter="s60" long-name="Java UIs Build">
+<unit bldFile="/sf/app/jrt/javauis" proFile="javauis.pro"/>
 </component>
 </collection>
-<collection name="javamanager" level="generic">
-<component name="javamanager_build" long-name="JRT Build" filter="s60" purpose="optional">
-<unit bldFile="/sf/app/jrt/javamanager" filter="!sf_build" proFile="javamanager.pro" qmakeArgs="-r"/>
-<unit bldFile="/sf/app/jrt/javamanager" filter="sf_build" proFile="javamanager.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+<collection name="javamanager" long-name="Java Manager" level="generic">
+<component name="javamanager_build" filter="s60" long-name="Java Manager Build">
+<unit bldFile="/sf/app/jrt/javamanager" proFile="javamanager.pro"/>
 </component>
 </collection>
 <collection name="javatools" long-name="Java Tools" level="util">
-<component name="javatools_build" long-name="JRT Build" filter="s60" purpose="optional">
-<unit bldFile="/sf/app/jrt/javatools" filter="!sf_build" proFile="javatools.pro" qmakeArgs="-r"/>
-<unit bldFile="/sf/app/jrt/javatools" filter="sf_build" proFile="javatools.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+<component name="javatools_build" filter="s60" long-name="Java Tools Build">
+<unit bldFile="/sf/app/jrt/javatools" proFile="javatools.pro"/>
 </component>
 </collection>
 <collection name="javaextensions" long-name="Java Extensions" level="generic">
-<component name="javaextensions_build" long-name="JRT Build" filter="s60" purpose="optional">
-<unit bldFile="/sf/app/jrt/javaextensions" filter="!sf_build" proFile="javaextensions.pro" qmakeArgs="-r"/>
-<unit bldFile="/sf/app/jrt/javaextensions" filter="sf_build" proFile="javaextensions.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
+<component name="javaextensions_build" filter="s60" long-name="Java Extensions Build">
+<unit bldFile="/sf/app/jrt/javaextensions" proFile="javaextensions.pro"/>
 </component>
 </collection>
 </block>