# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1263392632 0
# Node ID 1dbb20c5fec61e19e58f582a617b480e5584e241
# Parent  f0f450f5b73f88757ef16e7bdefabb0a924ced72# Parent  0b5c43f598085892059eef60bcf8f7005647e8bb
Merge

diff -r f0f450f5b73f -r 1dbb20c5fec6 symbian3/split/sources_staging_fcl.csv
--- a/symbian3/split/sources_staging_fcl.csv	Wed Jan 13 14:23:08 2010 +0000
+++ b/symbian3/split/sources_staging_fcl.csv	Wed Jan 13 14:23:52 2010 +0000
@@ -24,7 +24,7 @@
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/imgeditor/,/sf/app/imgeditor,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/imgvieweruis/,/sf/app/imgvieweruis,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/iptelephony/,/sf/app/iptelephony,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/java/,/sf/app/java,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/jrt/,/sf/app/jrt,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/location/,/sf/app/location,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/messaging/,/sf/app/messaging,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,branch,default,layers.sysdef.xml
diff -r f0f450f5b73f -r 1dbb20c5fec6 symbian3/split/sysdefs/system_model_os.xml
--- a/symbian3/split/sysdefs/system_model_os.xml	Wed Jan 13 14:23:08 2010 +0000
+++ b/symbian3/split/sysdefs/system_model_os.xml	Wed Jan 13 14:23:52 2010 +0000
@@ -2239,7 +2239,7 @@
 <block name="speechsrv" level="services" long-name="Speech Recognition UIs"/>
 <block name="homescreentools" level="services" long-name="Home Screen Tools"/>
 <block name="webuis" level="services" long-name="Web UIs"/>
-<block name="java" level="services" long-name="Java"/>
+<block name="jrt" level="services" long-name="JRT"/>
 <block name="rndtools" level="services" long-name="RD tools"/>
 <block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
 <collection name="helps_info" long-name="Help Apps Info" level="ui">
diff -r f0f450f5b73f -r 1dbb20c5fec6 symbian3/split/sysdefs/system_model_s60.xml
--- a/symbian3/split/sysdefs/system_model_s60.xml	Wed Jan 13 14:23:08 2010 +0000
+++ b/symbian3/split/sysdefs/system_model_s60.xml	Wed Jan 13 14:23:52 2010 +0000
@@ -91,7 +91,7 @@
   cwd CDATA #REQUIRED
   command CDATA #REQUIRED>
 ]>
-<SystemDefinition name="S60_SystemBuild + sysdef_dtd_1_4_0_xml + QuickOffice + adobereader + webvideo + wmdrmkeystorage_dist + wmdrmpd_dist + zipviewer + s60platformrelease + oemrndtools + swconfigapps + avdomain + btaudioadaptation_stub + drm_stub + ocrsrv_stub + omasuplasnconverterstubimpl + posmsgpluginreferenceimpl + power_save_display_mode_stub + srsfenginestub + systemswstubs + tactileclickplugin_stub + wlanhwinit_stub + camera + commonemail + conntools + contacts + contentcontrol + conversations + devicecontrol + systemswextensions + files + gallery + graphicsuis + helps + homescreen + im + imgvieweruis + iptelephony + java + location + messaging + mmsharinguis + avdomain + organizer + phone + photos + printing + profile + radio + rndtools + screensaver + settingsuis + speechsrv + graphics + utils + video + videotelephony + avdomain + webuis + accesssec + appinstall + appsupport + btservices + camerasrv + classicui + dlnasrv + drm + gsprofilesrv + hapticsservices + avdomain + homescreensrv + imghandling + imsrv + inputmethods + ipappprotocols + ipappservices + ipconnmgmt + legacypresence + locationsrv + mds + messagingmw + metadatasrv + avdomain + avdomain + mmuifw + netprotocols + networkingdm + opensrv + phonesrv + platformtools + remoteconn + remotemgmt + remotestorage + securitysrv + serviceapi + serviceapifw + shortlinkconn + ossrv + svgt + uiaccelerator + uiresources + uitools + usbservices + videoutils + vpnclient + web + websrv + wirelessacc + bt + cellularsrv + deviceplatformrelease + devicesrv + graphics + imagingext + lbs + avdomainosext + networkingsrv + osrndtools + ossrv + systemswextensions + usb + wlan + xmlsrv + buildplatforms + homescreentools + swconfigtools" schema="1.4.0">
+<SystemDefinition name="S60_SystemBuild + sysdef_dtd_1_4_0_xml + QuickOffice + adobereader + webvideo + wmdrmkeystorage_dist + wmdrmpd_dist + zipviewer + s60platformrelease + oemrndtools + swconfigapps + avdomain + btaudioadaptation_stub + drm_stub + ocrsrv_stub + omasuplasnconverterstubimpl + posmsgpluginreferenceimpl + power_save_display_mode_stub + srsfenginestub + systemswstubs + tactileclickplugin_stub + wlanhwinit_stub + camera + commonemail + conntools + contacts + contentcontrol + conversations + devicecontrol + systemswextensions + files + gallery + graphicsuis + helps + homescreen + im + imgvieweruis + iptelephony + jrt + location + messaging + mmsharinguis + avdomain + organizer + phone + photos + printing + profile + radio + rndtools + screensaver + settingsuis + speechsrv + graphics + utils + video + videotelephony + avdomain + webuis + accesssec + appinstall + appsupport + btservices + camerasrv + classicui + dlnasrv + drm + gsprofilesrv + hapticsservices + avdomain + homescreensrv + imghandling + imsrv + inputmethods + ipappprotocols + ipappservices + ipconnmgmt + legacypresence + locationsrv + mds + messagingmw + metadatasrv + avdomain + avdomain + mmuifw + netprotocols + networkingdm + opensrv + phonesrv + platformtools + remoteconn + remotemgmt + remotestorage + securitysrv + serviceapi + serviceapifw + shortlinkconn + ossrv + svgt + uiaccelerator + uiresources + uitools + usbservices + videoutils + vpnclient + web + websrv + wirelessacc + bt + cellularsrv + deviceplatformrelease + devicesrv + graphics + imagingext + lbs + avdomainosext + networkingsrv + osrndtools + ossrv + systemswextensions + usb + wlan + xmlsrv + buildplatforms + homescreentools + swconfigtools" schema="1.4.0">
 <systemModel>
 	<layer name="os_layer">
 <module name="bt">
@@ -410,9 +410,10 @@
 <module name="iptelephony">
         <unit name="iptelephony" unitID="te.iptelephony" bldFile="sf/app/iptelephony/group" mrp=""/>
       </module>
-<module name="java">
-<unit unitID="java.java.java_plat" mrp="" bldFile="sf/app/java/java_plat/group" filter="sf_build" name="java_java_plat"/>
-<unit unitID="java.java.java_stubs" mrp="" bldFile="sf/app/java/java_stubs/group" filter="sf_build" name="java_java_stubs"/></module>
+<module name="jrt">
+<unit unitID="jrt.jrt.java_plat" mrp="" bldFile="sf/app/jrt/java_plat/group" filter="sf_build" name="java_java_plat"/>
+<unit unitID="jrt.jrt.java_stubs" mrp="" bldFile="sf/app/jrt/java_stubs/group" filter="sf_build" name="java_java_stubs"/>
+</module>
 <module name="location">
         <unit unitID="lodo.location" mrp="" bldFile="sf/app/location/group" name="location"/>
       </module>