# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1266258355 0
# Node ID 0602da5051973d8fe9b908f3d8402ed459b70d39
# Parent  bd5873ced9e4c913cf6aa528267e7af3ab649796# Parent  62d0e50840f8e508c71945a0b9a41f90d5b16002
Merge

diff -r bd5873ced9e4 -r 0602da505197 symbian3/adaptation/qemu/sources.csv
--- a/symbian3/adaptation/qemu/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/adaptation/qemu/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,3 +1,3 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,
\ No newline at end of file
+//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/adaptation/stubs/sources.csv
--- a/symbian3/adaptation/stubs/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/adaptation/stubs/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/camera/sources.csv
--- a/symbian3/app/camera/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/camera/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/commonemail/sources.csv
--- a/symbian3/app/commonemail/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/commonemail/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/conntools/sources.csv
--- a/symbian3/app/conntools/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/conntools/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/conntools/,/sf/app/conntools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/conntools/,/sf/app/conntools,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/contacts/sources.csv
--- a/symbian3/app/contacts/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/contacts/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/app/contacts/,/sf/app/contacts,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/contacts/,/sf/app/contacts,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/contentcontrol/sources.csv
--- a/symbian3/app/contentcontrol/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/contentcontrol/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/conversations/sources.csv
--- a/symbian3/app/conversations/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/conversations/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/conversations/,/sf/app/conversations,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/conversations/,/sf/app/conversations,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/devicecontrol/sources.csv
--- a/symbian3/app/devicecontrol/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/devicecontrol/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/app/devicecontrol/,/sf/app/devicecontrol,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/dictionary/sources.csv
--- a/symbian3/app/dictionary/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/dictionary/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/dictionary/,/sf/app/dictionary,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/dictionary/,/sf/app/dictionary,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/files/sources.csv
--- a/symbian3/app/files/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/files/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/files/,/sf/app/files,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/files/,/sf/app/files,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/gallery/package_definition.xml
--- a/symbian3/app/gallery/package_definition.xml	Tue Feb 09 18:59:09 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="gallery" level="apps" long-name="Gallery Apps">
-<collection name="s60">
-<component name="gallery">
-<unit bldFile="/sf/app/gallery/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/gallery/sources.csv
--- a/symbian3/app/gallery/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/gallery/,/sf/app/gallery,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/graphicsuis/sources.csv
--- a/symbian3/app/graphicsuis/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/graphicsuis/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/helps/sources.csv
--- a/symbian3/app/helps/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/helps/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/helps/,/sf/app/helps,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/helps/,/sf/app/helps,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/homescreen/sources.csv
--- a/symbian3/app/homescreen/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/homescreen/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/app/homescreen/,/sf/app/homescreen,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/homescreen/,/sf/app/homescreen,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/im/sources.csv
--- a/symbian3/app/im/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/im/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/im/,/sf/app/im,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/im/,/sf/app/im,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/imgeditor/sources.csv
--- a/symbian3/app/imgeditor/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/imgeditor/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/imgeditor/,/sf/app/imgeditor,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/imgeditor/,/sf/app/imgeditor,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/imgvieweruis/package_definition.xml
--- a/symbian3/app/imgvieweruis/package_definition.xml	Tue Feb 09 18:59:09 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="imgvieweruis" level="services" long-name="Image Viewer UIs">
-<collection name="s60">
-<component name="imgvieweruis">
-<unit bldFile="/sf/app/imgvieweruis/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/imgvieweruis/sources.csv
--- a/symbian3/app/imgvieweruis/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/imgvieweruis/,/sf/app/imgvieweruis,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/iptelephony/sources.csv
--- a/symbian3/app/iptelephony/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/iptelephony/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/iptelephony/,/sf/app/iptelephony,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/iptelephony/,/sf/app/iptelephony,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/java/package_definition.xml
--- a/symbian3/app/java/package_definition.xml	Tue Feb 09 18:59:09 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="java" level="services" long-name="Java">
-<collection name="s60">
-<component name="java_java_plat">
-<unit bldFile="/sf/app/java/java_plat/group" mrp=""/>
-</component>
-<component name="java_java_stubs">
-<unit bldFile="/sf/app/java/java_stubs/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/java/sources.csv
--- a/symbian3/app/java/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/java/,/sf/app/java,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/jrt/sources.csv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/jrt/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,2 @@
+source,dst,type,pattern,sysdef
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/jrt/,/sf/app/jrt,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/location/sources.csv
--- a/symbian3/app/location/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/location/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/location/,/sf/app/location,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/location/,/sf/app/location,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/messaging/sources.csv
--- a/symbian3/app/messaging/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/messaging/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/app/messaging/,/sf/app/messaging,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/messaging/,/sf/app/messaging,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/mmsharinguis/sources.csv
--- a/symbian3/app/mmsharinguis/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/mmsharinguis/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/musicplayer/sources.csv
--- a/symbian3/app/musicplayer/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/musicplayer/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/musicplayer/,/sf/app/musicplayer,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/musicplayer/,/sf/app/musicplayer,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/organizer/sources.csv
--- a/symbian3/app/organizer/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/organizer/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/app/organizer/,/sf/app/organizer,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/organizer/,/sf/app/organizer,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/phone/sources.csv
--- a/symbian3/app/phone/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/phone/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/phone/,/sf/app/phone,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/app/phone/,/sf/app/phone,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/photos/sources.csv
--- a/symbian3/app/photos/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/photos/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/photos/,/sf/app/photos,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/photos/,/sf/app/photos,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/poc/package_definition.xml
--- a/symbian3/app/poc/package_definition.xml	Tue Feb 09 18:59:09 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="poc" level="apps" long-name="PoC"/>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/poc/package_definition_3.0.xml
--- a/symbian3/app/poc/package_definition_3.0.xml	Tue Feb 09 18:59:09 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="poc" name="Push to Talk" levels="engine ui">
-  	<!-- should this be PoC, Push to Talk, or Push to Talk over Cellular? -->
-    <collection id="pocengine" name="PoC Engine" level="engine">
-      <component id="sipclientresolver" filter="s60" name="SIP Client Resolver">
-        	<!-- this should be #included from the above if it should be built -->
-        <!-- <unit bldFile="pocengine/sipclientresolver/group"/> -->
-      </component>
-      <component id="pocengine_build" filter="s60" name="PoC Engine Build">
-        <unit bldFile="pocengine/group"/>
-      </component>
-      <component id="pocengine_test" filter="s60" purpose="development" name="PoC Engine Test">
-      	<!-- can the test unit be safely removed, or should it be #included? --> 
-        <!-- <unit bldFile="pocengine/tsrc/public/basic/group"/> -->
-      </component>
-    </collection>
-    <collection id="pocui" name="PoC UI" level="ui">
-      <component id="pocuiintgr" filter="s60" name="PoC UI Integration">
-        <unit bldFile="pocui/pocuiintgr/group"/>
-        	<!-- the following should be #included from the above if they should be built -->
-        <!-- <unit bldFile="pocui/pocuiintgr/pocuiaiwplugin/group"/> -->
-        <!-- <unit bldFile="pocui/pocuiintgr/pocuiecomplugin/group"/> -->
-        <!-- <unit bldFile="pocui/pocuiintgr/pocuiintegrationservices/group"/> -->
-      </component>
-      <component id="pocui_app" filter="s60" name="PoC Application">
-        <unit bldFile="pocui/app/group"/>
-      </component>
-      <component id="pocui_build" filter="s60" name="PoC UI Build">
-        <unit bldFile="pocui/group"/>
-      </component>
-    </collection>
-    <collection id="poc_info" name="PoC Info" level="ui">
-      <component id="poc_build" filter="s60" name="PoC Build">
-      	<!-- can this be distributed into the other components? -->
-        <unit bldFile="group"/>
-      </component>
-      <component id="poc_plat" filter="s60" name="PoC Platform Interfaces" class="api">
-        <unit bldFile="poc_plat/group"/>
-      </component>
-      <component id="poc_help" filter="s60" name="PoC Help" class="doc">
-        <unit bldFile="help/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/poc/sources.csv
--- a/symbian3/app/poc/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/poc/,/sf/app/poc,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/printing/sources.csv
--- a/symbian3/app/printing/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/printing/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/printing/,/sf/app/printing,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/printing/,/sf/app/printing,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/profile/sources.csv
--- a/symbian3/app/profile/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/profile/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/profile/,/sf/app/profile,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/profile/,/sf/app/profile,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/radio/sources.csv
--- a/symbian3/app/radio/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/radio/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/radio/,/sf/app/radio,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/radio/,/sf/app/radio,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/rndtools/sources.csv
--- a/symbian3/app/rndtools/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/rndtools/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/rndtools/,/sf/app/rndtools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/rndtools/,/sf/app/rndtools,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/screensaver/sources.csv
--- a/symbian3/app/screensaver/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/screensaver/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/screensaver/,/sf/app/screensaver,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/screensaver/,/sf/app/screensaver,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/settingsuis/sources.csv
--- a/symbian3/app/settingsuis/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/settingsuis/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/settingsuis/,/sf/app/settingsuis,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/settingsuis/,/sf/app/settingsuis,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/speechsrv/sources.csv
--- a/symbian3/app/speechsrv/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/speechsrv/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/speechsrv/,/sf/app/speechsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/speechsrv/,/sf/app/speechsrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/techview/sources.csv
--- a/symbian3/app/techview/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/techview/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/techview/,/sf/app/techview,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/techview/,/sf/app/techview,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/utils/sources.csv
--- a/symbian3/app/utils/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/utils/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/utils/,/sf/app/utils,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/utils/,/sf/app/utils,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/videoeditor/sources.csv
--- a/symbian3/app/videoeditor/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/videoeditor/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/videoeditor/,/sf/app/videoeditor,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/videoeditor/,/sf/app/videoeditor,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/videoplayer/sources.csv
--- a/symbian3/app/videoplayer/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/videoplayer/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/videoplayer/,/sf/app/videoplayer,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/videoplayer/,/sf/app/videoplayer,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/videotelephony/sources.csv
--- a/symbian3/app/videotelephony/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/videotelephony/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/videotelephony/,/sf/app/videotelephony,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/videotelephony/,/sf/app/videotelephony,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/app/voicerec/sources.csv
--- a/symbian3/app/voicerec/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/app/voicerec/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/voicerec/,/sf/app/voicerec,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/voicerec/,/sf/app/voicerec,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/accesssec/sources.csv
--- a/symbian3/mw/accesssec/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/accesssec/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/accesssec/,/sf/mw/accesssec,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/accesssec/,/sf/mw/accesssec,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/appinstall/sources.csv
--- a/symbian3/mw/appinstall/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/appinstall/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/appsupport/sources.csv
--- a/symbian3/mw/appsupport/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/appsupport/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/btservices/sources.csv
--- a/symbian3/mw/btservices/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/btservices/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/btservices/,/sf/mw/btservices,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/btservices/,/sf/mw/btservices,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/camerasrv/sources.csv
--- a/symbian3/mw/camerasrv/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/camerasrv/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/classicui/sources.csv
--- a/symbian3/mw/classicui/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/classicui/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/classicui/,/sf/mw/classicui,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/classicui/,/sf/mw/classicui,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/dlnasrv/sources.csv
--- a/symbian3/mw/dlnasrv/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/dlnasrv/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/drm/sources.csv
--- a/symbian3/mw/drm/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/drm/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/drm/,/sf/mw/drm,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/drm/,/sf/mw/drm,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/gsprofilesrv/sources.csv
--- a/symbian3/mw/gsprofilesrv/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/gsprofilesrv/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/hapticsservices/sources.csv
--- a/symbian3/mw/hapticsservices/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/hapticsservices/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/helix/sources.csv
--- a/symbian3/mw/helix/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/helix/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/helix/,/sf/mw/helix,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/helix/,/sf/mw/helix,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/homescreensrv/sources.csv
--- a/symbian3/mw/homescreensrv/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/homescreensrv/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/imghandling/sources.csv
--- a/symbian3/mw/imghandling/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/imghandling/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/imghandling/,/sf/mw/imghandling,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/imghandling/,/sf/mw/imghandling,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/imsrv/sources.csv
--- a/symbian3/mw/imsrv/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/imsrv/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/imsrv/,/sf/mw/imsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/imsrv/,/sf/mw/imsrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/inputmethods/sources.csv
--- a/symbian3/mw/inputmethods/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/inputmethods/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/inputmethods/,/sf/mw/inputmethods,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/inputmethods/,/sf/mw/inputmethods,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/ipappprotocols/sources.csv
--- a/symbian3/mw/ipappprotocols/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/ipappprotocols/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/ipappsrv/sources.csv
--- a/symbian3/mw/ipappsrv/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/ipappsrv/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/ipconnmgmt/sources.csv
--- a/symbian3/mw/ipconnmgmt/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/ipconnmgmt/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/legacypresence/sources.csv
--- a/symbian3/mw/legacypresence/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/legacypresence/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/locationsrv/sources.csv
--- a/symbian3/mw/locationsrv/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/locationsrv/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/locationsrv/,/sf/mw/locationsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/mds/sources.csv
--- a/symbian3/mw/mds/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/mds/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mds/,/sf/mw/mds,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/mw/mds/,/sf/mw/mds,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/messagingmw/sources.csv
--- a/symbian3/mw/messagingmw/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/messagingmw/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/metadatasrv/sources.csv
--- a/symbian3/mw/metadatasrv/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/metadatasrv/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/mmappfw/sources.csv
--- a/symbian3/mw/mmappfw/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/mmappfw/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mmappfw/,/sf/mw/mmappfw,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/mmappfw/,/sf/mw/mmappfw,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/mmmw/sources.csv
--- a/symbian3/mw/mmmw/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/mmmw/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mmmw/,/sf/mw/mmmw,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/mmmw/,/sf/mw/mmmw,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/mmuifw/sources.csv
--- a/symbian3/mw/mmuifw/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/mmuifw/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/netprotocols/sources.csv
--- a/symbian3/mw/netprotocols/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/netprotocols/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/networkingdm/sources.csv
--- a/symbian3/mw/networkingdm/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/networkingdm/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/opensrv/sources.csv
--- a/symbian3/mw/opensrv/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/opensrv/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/opensrv/,/sf/mw/opensrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/opensrv/,/sf/mw/opensrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/phonesrv/sources.csv
--- a/symbian3/mw/phonesrv/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/phonesrv/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/platformtools/sources.csv
--- a/symbian3/mw/platformtools/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/platformtools/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/remoteconn/sources.csv
--- a/symbian3/mw/remoteconn/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/remoteconn/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/remotemgmt/sources.csv
--- a/symbian3/mw/remotemgmt/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/remotemgmt/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/remotestorage/sources.csv
--- a/symbian3/mw/remotestorage/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/remotestorage/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/securitysrv/sources.csv
--- a/symbian3/mw/securitysrv/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/securitysrv/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/shortlinkconn/sources.csv
--- a/symbian3/mw/shortlinkconn/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/shortlinkconn/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/srvdiscovery/sources.csv
--- a/symbian3/mw/srvdiscovery/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/srvdiscovery/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/svgt/sources.csv
--- a/symbian3/mw/svgt/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/svgt/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/svgt/,/sf/mw/svgt,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/svgt/,/sf/mw/svgt,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/uiaccelerator/sources.csv
--- a/symbian3/mw/uiaccelerator/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/uiaccelerator/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/uiresources/sources.csv
--- a/symbian3/mw/uiresources/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/uiresources/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/uitools/sources.csv
--- a/symbian3/mw/uitools/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/uitools/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/uitools/,/sf/mw/uitools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/mw/uitools/,/sf/mw/uitools,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/usbservices/sources.csv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/usbservices/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -0,0 +1,2 @@
+source,dst,type,pattern,sysdef
+//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/mw/usbservices/,/sf/mw/usbservices,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/videoutils/sources.csv
--- a/symbian3/mw/videoutils/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/videoutils/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/videoutils/,/sf/mw/videoutils,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/videoutils/,/sf/mw/videoutils,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/vpnclient/sources.csv
--- a/symbian3/mw/vpnclient/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/vpnclient/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/websrv/sources.csv
--- a/symbian3/mw/websrv/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/websrv/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/websrv/,/sf/mw/websrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/websrv/,/sf/mw/websrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/mw/wirelessacc/sources.csv
--- a/symbian3/mw/wirelessacc/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/mw/wirelessacc/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/boardsupport/sources.csv
--- a/symbian3/os/boardsupport/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/os/boardsupport/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/bt/sources.csv
--- a/symbian3/os/bt/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/os/bt/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/bt/,/sf/os/bt,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/bt/,/sf/os/bt,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/buildtools/sources.csv
--- a/symbian3/os/buildtools/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/os/buildtools/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/cellularsrv/sources.csv
--- a/symbian3/os/cellularsrv/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/os/cellularsrv/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/commsfw/sources.csv
--- a/symbian3/os/commsfw/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/os/commsfw/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/commsfw/,/sf/os/commsfw,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/commsfw/,/sf/os/commsfw,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/deviceplatformrelease/sources.csv
--- a/symbian3/os/deviceplatformrelease/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/os/deviceplatformrelease/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/devicesrv/sources.csv
--- a/symbian3/os/devicesrv/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/os/devicesrv/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/graphics/sources.csv
--- a/symbian3/os/graphics/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/os/graphics/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,3 +1,3 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/graphics/,/sf/os/graphics,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,
\ No newline at end of file
+//v800008/Builds01/mercurial_development_new/oss/FCL/sf/os/graphics/,/sf/os/graphics,branch,NewGraphicsArchitecture,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/imagingext/sources.csv
--- a/symbian3/os/imagingext/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/os/imagingext/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/kernelhwsrv/sources.csv
--- a/symbian3/os/kernelhwsrv/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/os/kernelhwsrv/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/lbs/sources.csv
--- a/symbian3/os/lbs/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/os/lbs/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/lbs/,/sf/os/lbs,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/os/lbs/,/sf/os/lbs,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/mm/sources.csv
--- a/symbian3/os/mm/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/os/mm/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,3 +1,3 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/mm/,/sf/os/mm,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mmmw/,/sf/mw/mmmw,branch,default,
\ No newline at end of file
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/mm/,/sf/os/mm,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/mmmw/,/sf/mw/mmmw,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/networkingsrv/sources.csv
--- a/symbian3/os/networkingsrv/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/os/networkingsrv/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/osrndtools/sources.csv
--- a/symbian3/os/osrndtools/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/os/osrndtools/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/ossrv/sources.csv
--- a/symbian3/os/ossrv/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/os/ossrv/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/ossrv/,/sf/os/ossrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/ossrv/,/sf/os/ossrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/persistentdata/sources.csv
--- a/symbian3/os/persistentdata/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/os/persistentdata/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/shortlinksrv/package_definition.xml
--- a/symbian3/os/shortlinksrv/package_definition.xml	Tue Feb 09 18:59:09 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os">
-<block name="shortlinksrv">
-<collection name="s60">
-<component name="shortlinksrv">
-<unit bldFile="/sf/os/shortlinksrv/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/shortlinksrv/sources.csv
--- a/symbian3/os/shortlinksrv/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/shortlinksrv/,/sf/os/shortlinksrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/textandloc/sources.csv
--- a/symbian3/os/textandloc/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/os/textandloc/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,4 +1,4 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/textandloc/,/sf/os/textandloc,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/graphics/,/sf/os/graphics,branch,default,
\ No newline at end of file
+//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development_new/oss/FCL/sf/os/graphics/,/sf/os/graphics,branch,NewGraphicsArchitecture,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/unref/sources.csv
--- a/symbian3/os/unref/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/unref/,/sf/os/unref,branch,default,
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/usb/sources.csv
--- a/symbian3/os/usb/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/os/usb/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,3 +1,3 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/usb/,/sf/os/usb,branch,default,
-//v800008/Builds01/mercurial_development/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,
\ No newline at end of file
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/usb/,/sf/os/usb,branch,default,
+//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/wlan/sources.csv
--- a/symbian3/os/wlan/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/os/wlan/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/os/xmlsrv/sources.csv
--- a/symbian3/os/xmlsrv/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/os/xmlsrv/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/tools/build_s60/sources.csv
--- a/symbian3/tools/build_s60/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/build_s60/,/sf/tools/build_s60,branch,default,
diff -r bd5873ced9e4 -r 0602da505197 symbian3/tools/buildplatforms/sources.csv
--- a/symbian3/tools/buildplatforms/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/tools/buildplatforms/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,
diff -r bd5873ced9e4 -r 0602da505197 symbian3/tools/homescreentools/sources.csv
--- a/symbian3/tools/homescreentools/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ b/symbian3/tools/homescreentools/sources.csv	Mon Feb 15 18:25:55 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,default,layers.sysdef.xml
diff -r bd5873ced9e4 -r 0602da505197 symbian3/tools/makefile_templates/sources.csv
--- a/symbian3/tools/makefile_templates/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/makefile_templates/,/sf/tools/makefile_templates,branch,default,
diff -r bd5873ced9e4 -r 0602da505197 symbian3/tools/swconfigtools/package_definition.xml
--- a/symbian3/tools/swconfigtools/package_definition.xml	Tue Feb 09 18:59:09 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="tools">
-<block name="swconfigtools">
-<collection name="s60">
-<component name="swconfigtools">
-<unit bldFile="/sf/tools/swconfigtools/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
diff -r bd5873ced9e4 -r 0602da505197 symbian3/tools/swconfigtools/sources.csv
--- a/symbian3/tools/swconfigtools/sources.csv	Tue Feb 09 18:59:09 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/swconfigtools/,/sf/tools/swconfigtools,branch,default,layers.sysdef.xml