# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1264520364 0
# Node ID 9d6a5309852c742712cb702f6cf14501181e7e69
# Parent  c0e6dd77e67f6caabbff9e5b1f20ad4ee20d04af# Parent  2958b22b1b70cfd781aa8646b5e6c34568af6468
Catchup merge

diff -r 2958b22b1b70 -r 9d6a5309852c common/build.postbuild.xml
--- a/common/build.postbuild.xml	Thu Jan 14 18:21:21 2010 +0000
+++ b/common/build.postbuild.xml	Tue Jan 26 15:39:24 2010 +0000
@@ -691,6 +691,8 @@
 			   <include name="libraries_report.xml"/>
 		   </fileset>
         </copy>
+		<mkdir dir="${publish.dir}/ats_reports"/>
+		<copy file="${sf.common.config.dir}/tools/ats/report_dummy.html" tofile="${publish.dir}/ats_reports/index.html" failonerror="false"/>
     </target>
 
     <!-- TODO: Make this work for package builds once we have sysmodel story worked out -->
diff -r 2958b22b1b70 -r 9d6a5309852c common/build.test.xml
diff -r 2958b22b1b70 -r 9d6a5309852c common/common_props.ant.xml
--- a/common/common_props.ant.xml	Thu Jan 14 18:21:21 2010 +0000
+++ b/common/common_props.ant.xml	Tue Jan 26 15:39:24 2010 +0000
@@ -110,6 +110,9 @@
     <property name="sf.spec.bccheck.current.s60.version" value="5.1"/>
     <property name="sf.spec.bccheck.reportid" value="report"/>
     <property name="sf.spec.bccheck.package.name" value="${env.COMPUTERNAME}-bctest-${sf.spec.job.name}_${sf.spec.job.codeline}.${sf.spec.job.number}.zip"/>
+	
+	<!-- Smoketest properties -->
+	<property name="sf.spec.smoketest.enable" value="true"/> <!-- This disables publishing Smoke Test Report -->
 </project>
 
 
diff -r 2958b22b1b70 -r 9d6a5309852c common/diamonds/linksForDiamonds.xml.ftl
--- a/common/diamonds/linksForDiamonds.xml.ftl	Thu Jan 14 18:21:21 2010 +0000
+++ b/common/diamonds/linksForDiamonds.xml.ftl	Tue Jan 26 15:39:24 2010 +0000
@@ -22,11 +22,13 @@
       <name>Build Logs</name>
       <url>file:///${ant['sf.spec.publish.networkdrive']}\${ant['sf.spec.job.name']}\builds\${ant['sf.spec.job.codeline']}\${ant['build.id']}\build_logs.zip</url>
     </file>
-    <file>
-      <type>log</type>
-      <name>Smoke Test Report</name>
-      <url>file:///${ant['sf.spec.publish.networkdrive']}\${ant['sf.spec.job.name']}\builds\${ant['sf.spec.job.codeline']}\${ant['build.id']}\ats_reports\ATS3Report.html</url>	  
-    </file>
+    <#if "${ant['sf.spec.smoketest.enable']}" = "true">
+      <file>
+        <type>log</type>
+        <name>Smoke Test Report</name>
+        <url>file:///${ant['sf.spec.publish.networkdrive']}\${ant['sf.spec.job.name']}\builds\${ant['sf.spec.job.codeline']}\${ant['build.id']}\ats_reports\ATS3Report.html</url>	  
+      </file>
+    </#if>
     <#if "${ant['sf.spec.bccheck.enable']}" = "true" && "${ant['sf.spec.bccheck.enable.ha']}" = "true">
       <file>
         <type>log</type>
@@ -40,6 +42,13 @@
         <name>Binary Compatibility Report (Libraries)</name>
         <url>file:///${ant['sf.spec.publish.networkdrive']}\${ant['sf.spec.job.name']}\builds\${ant['sf.spec.job.codeline']}\${ant['build.id']}\BC\libraries_report.xml</url>	  
       </file>
-    </#if>	
+    </#if>
+    <#if "${ant['sf.spec.bccheck.enable.dynamic']}" = "true">
+      <file>
+        <type>log</type>
+        <name>Dynamic BC Test Reports</name>
+        <url>file:///${ant['sf.spec.publish.networkdrive']}\${ant['sf.spec.job.name']}\builds\${ant['sf.spec.job.codeline']}\${ant['build.id']}\ats_reports\index.html</url>	  
+      </file>
+    </#if>
    </files>
 </diamonds-build>
\ No newline at end of file
diff -r 2958b22b1b70 -r 9d6a5309852c common/sysdefdowngrade/filter-module.xsl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/sysdefdowngrade/filter-module.xsl	Tue Jan 26 15:39:24 2010 +0000
@@ -0,0 +1,110 @@
+<?xml version="1.0"?>
+ <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exslt="http://exslt.org/common"  exclude-result-prefixes="exslt">
+	<xsl:output method="xml" indent="yes"/>
+
+
+<!-- filters can only return hide or show -->
+
+<!-- filter-only =  item's @filter can only have items from the list
+	anything with no filters passes
+-->
+<xsl:template match="filter-only" mode="filter"><xsl:param name="item"/>
+	<xsl:if test="$item[@filter]">
+		<xsl:variable name="this" select="."/>
+		<xsl:variable name="my-filters">
+			<xsl:call-template name="filter-list">
+				<xsl:with-param name="f" select="$item/parent::component/@filter"/>
+			</xsl:call-template>
+			<xsl:call-template name="filter-list">
+				<xsl:with-param name="f" select="$item/@filter"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:variable name="match">
+			<xsl:for-each select="exslt:node-set($my-filters)/*">
+				<xsl:if test="not($this/*[name()=name(current())  and @v=current()/@v])">x</xsl:if>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:if test="$match!=''">hide</xsl:if>
+	</xsl:if>
+</xsl:template>
+
+
+
+<!-- filter-has =  item's @filter must have all filters in the list. ie it can have any other filters, but these must all be present	
+-->
+<xsl:template match="filter-has" mode="filter"><xsl:param name="item"/>
+	<xsl:if test="$item[(self::component or self::unit)  and not(unit/@filter or self::unit[not(../unit[@filter])])]">
+		<xsl:variable name="my-filters">
+			<xsl:call-template name="filter-list">
+				<xsl:with-param name="f" select="$item/parent::component/@filter"/>
+			</xsl:call-template>
+			<xsl:call-template name="filter-list">
+				<xsl:with-param name="f" select="$item/@filter"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:variable name="match">
+			<xsl:for-each select="*">
+				<!-- 	if(f in this) {return true}  else if(!f in this) {return false} else {return !(f is positive)} -->
+				<xsl:choose>
+					<xsl:when test="exslt:node-set($my-filters)/*[name()=name(current()) and @v=current()/@v]"/> <!-- filter in item -->
+					<xsl:when test="exslt:node-set($my-filters)/*[name()!=name(current()) and @v=current()/@v]">x</xsl:when> <!-- !filter in item -->
+					<xsl:when test="self::filter">x</xsl:when> <!-- !(filter is positive) -->
+				</xsl:choose>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:if test="$match!=''">hide</xsl:if>
+	</xsl:if>
+</xsl:template>
+
+<xsl:template match="filter-with" mode="filter"><xsl:param name="item"/>
+	<xsl:if test="$item[(self::component or self::unit)  and not(unit/@filter or self::unit[not(../unit[@filter])])]">
+		<xsl:variable name="my-filters">
+			<xsl:call-template name="filter-list">
+				<xsl:with-param name="f" select="$item/parent::component/@filter"/>
+			</xsl:call-template>
+			<xsl:call-template name="filter-list">
+				<xsl:with-param name="f" select="$item/@filter"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:variable name="match">
+			<xsl:for-each select="*">
+				<xsl:if test="exslt:node-set($my-filters)/*[name()!=name(current()) and @v=current()/@v]">x</xsl:if> <!-- !filter in item -->
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:if test="$match!=''">hide</xsl:if>
+	</xsl:if>
+</xsl:template>
+
+
+
+<xsl:template name="filter-item"> <xsl:param name="f"/>
+	<!-- create an element for a given filter. If the filter's empty make nothing -->
+	<xsl:choose>
+		<xsl:when test="$f=''"/>
+		<xsl:when test="starts-with($f,'!')">
+				<not v="{substring($f,2)}"/>
+		</xsl:when>
+		<xsl:otherwise>
+				<filter v="{$f}"/>
+		</xsl:otherwise>
+	</xsl:choose>
+</xsl:template>
+
+<xsl:template name="filter-list"><xsl:param name="f"/>
+	<!-- turn a filter list into a set of elements (<filter> or <not>) with the attribute "v" containing the "absolute value" of the filter
+		filter="A,B,!C" becomes  <filter v="A"/><filter v="B"/><not v="C"/> 
+	  -->
+	<xsl:choose>
+		<xsl:when test="contains($f,',')">
+			<xsl:call-template name="filter-item"><xsl:with-param name="f" select="normalize-space(substring-before($f,','))"/></xsl:call-template>
+			<xsl:call-template name="filter-list">
+				<xsl:with-param name="f" select="substring-after($f,',')"/>
+			</xsl:call-template>
+		</xsl:when>
+		<xsl:otherwise>
+			<xsl:call-template name="filter-item"><xsl:with-param name="f" select="normalize-space($f)"/></xsl:call-template>
+		</xsl:otherwise>
+	</xsl:choose>
+</xsl:template>
+
+</xsl:stylesheet> 
\ No newline at end of file
diff -r 2958b22b1b70 -r 9d6a5309852c common/sysdefdowngrade/filtering.xsl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/sysdefdowngrade/filtering.xsl	Tue Jan 26 15:39:24 2010 +0000
@@ -0,0 +1,265 @@
+<?xml version="1.0"?>
+ <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exslt="http://exslt.org/common"  exclude-result-prefixes="exslt">
+	<xsl:output method="xml" indent="yes"/>
+
+<!-- filter a sysdef (2.0 or 3.0 syntax)-->
+
+<xsl:param name="filter-type">only</xsl:param> <!-- only, has or with -->
+
+<xsl:param name="filter"/> <!-- comma-separated list -->
+
+<xsl:param name="addbuild" select="0"/> <!-- add a system build section that accepts everything -->
+
+
+<xsl:template match="node()|@*"><xsl:copy-of select="."/></xsl:template>
+<xsl:template match="*"><xsl:param name="data"/>
+	<xsl:copy>
+		<xsl:copy-of select="@*"/>
+		<xsl:apply-templates select="node()">
+			<xsl:with-param name="data" select="$data"/>
+		</xsl:apply-templates>
+	</xsl:copy>
+</xsl:template>
+
+<xsl:template match="component|unit"><xsl:param name="data"/> <!-- filterable items -->
+	 <xsl:variable name="display">
+	 	<xsl:apply-templates select="$data" mode="filter">
+			<xsl:with-param name="item" select="current()"/>
+		</xsl:apply-templates>
+	 </xsl:variable>
+	 
+	 <xsl:if test="$display != 'hide' "> <!-- if hide, remove completely from the output-->
+		<xsl:copy>
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates select="node()">
+				<xsl:with-param name="data" select="$data"/>
+			</xsl:apply-templates>
+		</xsl:copy>
+	</xsl:if>
+</xsl:template>
+
+<xsl:template match="/SystemDefinition">
+	<xsl:variable name="f">
+		<xsl:element name="filter-{$filter-type}">
+			<xsl:call-template name="filter-list">
+				<xsl:with-param name="f" select="$filter"/>
+			</xsl:call-template>
+		</xsl:element>
+	</xsl:variable>
+	<xsl:choose>
+		<xsl:when test="starts-with(@schema,'3.0')"/> <!-- no DTD needed for 3.0 sysdef -->
+		<xsl:when test="$addbuild">
+			<xsl:call-template name="DTD-bld"/> <!-- insert 2.0.1 DTD w/sysbuild parts-->
+		</xsl:when>
+		<xsl:otherwise>
+			<xsl:call-template name="DTD"/> <!-- insert 2.0.1 DTD -->
+		</xsl:otherwise>
+	</xsl:choose>
+	<xsl:copy>
+		<xsl:copy-of select="@*"/>
+		<xsl:variable name="content"> <!-- save content for potential further processing -->
+			<xsl:apply-templates select="node()">
+				<xsl:with-param name="data" select="exslt:node-set($f)/*"/>
+			</xsl:apply-templates>
+		</xsl:variable>
+		<!-- just output content as is. We could create a template to remove any filtered out items, but so far there's no compelling need -->
+		<xsl:copy-of select="$content"/>  
+
+		<xsl:if test="$addbuild">
+			<SystemBuild schema="1.0.0">
+				<configuration name="any" description="text">
+					<xsl:attribute name="filter">
+						<xsl:for-each select="//@filter[not(.=following::*/@filter)]">
+							<xsl:value-of select="."/><xsl:if test="position()!=last()">,</xsl:if>
+						</xsl:for-each>
+					</xsl:attribute>
+					<xsl:for-each select="exslt:node-set($content)/systemModel/layer[descendant::unit]">
+						<!-- only include layers we know have units -->
+						<ref item="{@name}"/>
+					</xsl:for-each>
+				</configuration>
+			</SystemBuild>
+		</xsl:if>
+	</xsl:copy>
+</xsl:template>
+
+
+<xsl:include href="filter-module.xsl"/>
+
+<xsl:template name="DTD-bld">
+<xsl:text disable-output-escaping="yes"><![CDATA[<!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>
+]>
+]]></xsl:text>
+</xsl:template>
+
+<xsl:template name="DTD">
+<xsl:text disable-output-escaping="yes"><![CDATA[<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!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
+>
+]>
+]]></xsl:text>
+</xsl:template>
+</xsl:stylesheet>	
\ No newline at end of file
diff -r 2958b22b1b70 -r 9d6a5309852c common/sysdefdowngrade/joinsysdef-module.xsl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/sysdefdowngrade/joinsysdef-module.xsl	Tue Jan 26 15:39:24 2010 +0000
@@ -0,0 +1,489 @@
+<?xml version="1.0"?>
+ <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+ 	xmlns:exslt="http://exslt.org/common" exclude-result-prefixes="exslt">
+	<!-- save SF namespace as a constant to avoid the risk of typos-->
+ <xsl:variable name="defaultns">http://www.symbian.org/system-definition</xsl:variable>
+ 
+<!-- create a stand-alone sysdef from a linked set of fragments -->
+
+<xsl:template match="/*" mode="join">
+	<xsl:message terminate="yes">Cannot process this document</xsl:message>
+</xsl:template>
+
+
+<xsl:template match="/SystemDefinition[@schema='3.0.0' and count(*)=1]" mode="join">
+	<xsl:param name="origin" select="/.."/>
+	<xsl:param name="root"/>
+	<xsl:param name="filename"/>
+	<xsl:param name="namespaces"/>
+	<xsl:param name="data" select="/.."/>
+	<xsl:choose>
+		<xsl:when test="$origin">	<!-- this sysdef fragment was linked from a parent sysdef -->
+			<xsl:for-each select="*"> <!-- can be only one -->
+				<xsl:variable name="upid"><xsl:apply-templates select="$origin/@id" mode="my-id"/></xsl:variable>		<!-- namespaceless ID of this in parent doc -->
+				<xsl:variable name="id"><xsl:apply-templates select="@id" mode="my-id"/></xsl:variable>						<!-- namespaceless ID of this here -->
+				<xsl:variable name="upns"><xsl:apply-templates select="$origin/@id" mode="my-namespace"/></xsl:variable>	<!-- ID's namespace in parent doc -->
+				<xsl:variable name="ns"><xsl:apply-templates select="@id" mode="my-namespace"/></xsl:variable>	<!-- ID's namespace -->
+				<xsl:if test="$id!=$upid or $ns!=$upns">
+					<xsl:message terminate="yes">Linked ID "<xsl:value-of select="$id"/>" (<xsl:value-of select="$ns"/>) must match linking document "<xsl:value-of select="$upid"/>" (<xsl:value-of select="$upns"/>)</xsl:message>
+				</xsl:if>
+				<!-- copy any attributes not already defined (parent doc overrides child doc)-->
+				<xsl:for-each select="@*">
+					<xsl:variable name="n" select="name()"/>
+					<xsl:choose>
+						<xsl:when test="$n='id'"/> <!-- never copy this, always set -->
+						<xsl:when test="$origin/@*[name()=$n]"> <!-- don't copy if already set -->
+							<xsl:message>Cannot set "<xsl:value-of select="$n"/>", already set</xsl:message>
+						</xsl:when>
+						<xsl:when test="$n='before'">
+							<!-- ensure ns is correct (if any future attribtues will ever use an ID, process it here too)-->
+							<xsl:apply-templates select="." mode="join">
+								<xsl:with-param name="namespaces" select="$namespaces"/>
+							</xsl:apply-templates>
+						</xsl:when> 
+						<xsl:otherwise><xsl:copy-of select="."/></xsl:otherwise> <!-- just copy anything else -->
+					</xsl:choose>
+				</xsl:for-each>
+				<xsl:copy-of select="../namespace::*[not(.=$namespaces)]"/> <!-- set any namespaces not already set (they should all alreayd be, but some XSLT processors are quirky) -->
+			 	<xsl:apply-templates select="$data" mode="overlay-attributes">
+					<xsl:with-param name="item" select="current()"/>
+				</xsl:apply-templates>
+				<xsl:variable name="content">									
+					<xsl:apply-templates select="*|comment()" mode="join">
+						<xsl:with-param name="root" select="$root"/>
+						<xsl:with-param name="filename" select="$filename"/>
+						<xsl:with-param name="data" select="$data"/>
+						<xsl:with-param name="namespaces" select="$namespaces | ../namespace::*[not(.=$namespaces)]"/>
+					</xsl:apply-templates>
+				</xsl:variable>
+				<xsl:apply-templates select="." mode="is-content-filtered"> <!-- optionally add filtered="yes" if some content has been removed -->
+					<xsl:with-param name="content" select="$content"/>
+				</xsl:apply-templates>
+			 	<xsl:apply-templates select="$data" mode="overlay-meta">
+					<xsl:with-param name="item" select="current()"/>
+				</xsl:apply-templates>
+				<xsl:copy-of select="$content"/>
+			</xsl:for-each>
+		</xsl:when>
+		<xsl:when test="function-available('exslt:node-set')"> <!-- this is the root element of a root sysdef -->
+			<!--try to put all namespaces in root element -->
+			<xsl:variable name="nss">
+				<!-- contains node set of namespaces to add to root element.
+					May panic if there are too many single-letter namespaces and this can't create a new one -->
+				<xsl:call-template name="needed-namespaces">
+					<xsl:with-param name="foundns">
+						<xsl:apply-templates select="//*[(self::component or self::collection or self::package or self::layer) and @href]" mode="scan-for-namespaces"/>
+					</xsl:with-param>
+				</xsl:call-template>
+			</xsl:variable>
+			<xsl:variable name="ns" select="@id-namespace | namespace::* | exslt:node-set($nss)/*"/>
+			<xsl:copy><xsl:copy-of select="@*"/>
+				<xsl:apply-templates select="self::*[not(@id-namespace)]" mode="add-id-ns"/>
+				<xsl:for-each select="exslt:node-set($nss)/*"> <!-- add namespace definitions -->
+					<xsl:attribute name="xmlns:{name()}">
+						<xsl:value-of select="."/>
+					</xsl:attribute>
+				</xsl:for-each>
+				<!-- no need to call is-content-filtered, it never will be from this element --> 
+				<xsl:apply-templates select="*|comment()" mode="join">
+					<xsl:with-param name="namespaces" select="$ns"/>
+					<xsl:with-param name="root" select="$root"/>
+					<xsl:with-param name="data" select="$data"/>
+					<xsl:with-param name="filename" select="$filename"/>
+				</xsl:apply-templates>
+			</xsl:copy>
+		</xsl:when>
+		<xsl:otherwise> <!-- can't handle node-set() so put the namespaces in the document instead of the root element-->
+			<xsl:variable name="ns" select="@id-namespace | namespace::*"/>
+			<xsl:copy><xsl:copy-of select="@*"/>
+				<!-- no need to call is-content-filtered, it never will be from this element -->
+				<xsl:apply-templates select="*|comment()" mode="join">
+					<xsl:with-param name="namespaces" select="$ns"/>
+					<xsl:with-param name="root" select="$root"/>
+					<xsl:with-param name="data" select="$data"/>
+					<xsl:with-param name="filename" select="$filename"/>
+				</xsl:apply-templates>
+			</xsl:copy>
+		</xsl:otherwise>
+	</xsl:choose>
+</xsl:template>
+
+<xsl:template match="*" mode="scan-for-namespaces"/> <!-- just in case of errors, consider replacing by terminate -->
+<xsl:template match="*[@href and not(self::meta)]" mode="scan-for-namespaces">
+	<!-- produce a list of namespace-prefix namespace pairs separated by newlines, in reverse order found in documents 
+		reverse order so we can try to use the first namespace prefix defined if it's available-->
+	<xsl:for-each select="document(@href,.)/*">
+		<xsl:apply-templates select="//*[(self::component or self::collection or self::package or self::layer) and @href]" mode="scan-for-namespaces"/>
+		<xsl:for-each select="//namespace::* | @id-namespace">
+			<xsl:value-of select="concat(name(),' ',.,'&#xa;')"/>
+		</xsl:for-each>
+	</xsl:for-each>			
+</xsl:template>
+
+<xsl:template name="needed-namespaces">
+	<xsl:param name="foundns"/>
+	<xsl:param name="usedpre"/>
+	
+	<xsl:if test="foundns!=''">
+		<xsl:variable name="line" select="substring-before($foundns,'&#xa;')"/> <!-- always has trailing newline -->
+		<xsl:variable name="name" select="substring-after($line,' ')"/> <!-- namespace prefix -->
+		<xsl:variable name="remainder" select="substring-after($foundns,'&#xa;')"/>
+		<xsl:variable name="newprefix">
+			<xsl:if test="not(contains(concat('&#xa;',$remainder),concat('&#xa;',$line,'&#xa;'))) and
+				not(//namespace::*[.=$name] or @id-namespace[.=$name] or (not(@id-namespace) and $defaultns=$name))">
+						<xsl:apply-templates select="." mode="ns-prefix">
+							<xsl:with-param name="ns" select="$name"/>
+							<xsl:with-param name="pre" select="substring-before($line,' ')"/>
+							<xsl:with-param name="dontuse" select="$usedpre"/>
+						</xsl:apply-templates>
+			</xsl:if>
+		</xsl:variable>
+		<xsl:if test="$newprefix!=''">
+			<!-- can treat this as if it were a namespace node -->
+			<xsl:element name="{$newprefix}">
+				<xsl:value-of select="$name"/>
+			</xsl:element>
+		</xsl:if>
+		<xsl:if test="$remainder!=''">
+			<xsl:call-template name="needed-namespaces">
+				<xsl:with-param name="foundns" select="$remainder"/>
+				<xsl:with-param name="usedpre" select="concat($usedpre,' ',$newprefix,' ')"/>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:if>
+</xsl:template>
+
+<xsl:template match="/SystemDefinition" mode="ns-prefix">
+	<!-- should be able to replace this with mechanism that uses the XSLT processor's own ability to generate namespaces -->
+	<xsl:param name="ns"/>
+	<xsl:param name="pre"/>
+	<xsl:param name="dontuse"/>
+	<xsl:param name="chars">ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz</xsl:param>
+	<xsl:variable name="name" select="substring(substring-after($ns,'http://www.'),1,1)"/>
+	<xsl:choose>
+		<xsl:when test="$pre!='' and $pre!='id-namespace' and not(//namespace::*[name()=$pre]) and not(contains($dontuse,concat(' ',$pre,' ')))">
+			<xsl:value-of select="$pre"/>
+		</xsl:when>
+		<xsl:when test="$ns='' and $chars=''">
+			<xsl:message terminate="yes">Cannot create namespace prefix for downstream default namespace</xsl:message>
+		</xsl:when>
+		<xsl:when test="$name!='' and not(contains($dontuse,concat(' ',$name,' ')))"><xsl:value-of select="$name"/></xsl:when>
+		<xsl:when test="namespace::*[name()=substring($chars,1,1)] or contains($dontuse,concat(' ',substring($chars,1,1),' '))">
+			<xsl:apply-templates mode="ns-prefix">
+				<xsl:with-param name="chars" select="substring($chars,2)"/>
+			</xsl:apply-templates>
+		</xsl:when>
+		<xsl:otherwise>
+			<xsl:value-of select="substring($chars,1,1)"/>
+		</xsl:otherwise>
+	</xsl:choose>
+</xsl:template>
+
+
+<xsl:template match="unit" mode="join">	<xsl:param name="root"/><xsl:param name="filename"/><xsl:param name="data"/>
+	 <xsl:variable name="display">
+	 	<xsl:apply-templates select="$data" mode="filter">
+			<xsl:with-param name="item" select="current()"/>
+		</xsl:apply-templates>
+	 </xsl:variable>
+	 
+	 <xsl:if test="$display != 'hide' "> <!-- if hide, remove completely from the output-->	 
+		<xsl:element name="{name()}">
+			<xsl:apply-templates select="@*" mode="join">
+				<xsl:with-param name="root" select="$root"/>
+				<xsl:with-param name="filename" select="$filename"/>
+			</xsl:apply-templates>
+		</xsl:element>
+	</xsl:if>
+</xsl:template>
+
+<!-- override mode="meta" to translate metadata sections. By default, include -->
+<xsl:template match="meta" priority="2"><xsl:param name="data"/>
+	 <xsl:variable name="display">
+	 	<xsl:apply-templates select="$data" mode="filter">
+			<xsl:with-param name="item" select="current()"/>
+		</xsl:apply-templates>
+	 </xsl:variable>
+	 
+	<xsl:if test="$display != 'hide' "> <!-- if hide, remove completely from the output-->	
+		<xsl:apply-templates select="." mode="meta"> 
+			<xsl:with-param name="display" select="$display"/>
+			<xsl:with-param name="data" select="$data"/>
+		</xsl:apply-templates>
+	</xsl:if>
+</xsl:template>
+
+
+<xsl:template match="*" mode="join">
+	<xsl:param name="root"/><xsl:param name="filename"/><xsl:param name="namespaces"/><xsl:param name="data"/>
+	<!-- get attribtues from overlay -->
+	<!-- test for presence, if filtered out, just return -->
+	<!-- test for children, if it has some, but they're filtered out, either return or leave as empty, dependening on filter rule
+		if had items and now has none, options:
+			still has meta: keep / delete
+			still has comments: keep / delete 
+	 -->
+	 
+	 <xsl:variable name="display">
+	 	<xsl:apply-templates select="$data" mode="filter">
+			<xsl:with-param name="item" select="current()"/>
+		</xsl:apply-templates>
+	 </xsl:variable>
+	 
+	 <xsl:if test="$display != 'hide' "> <!-- if hide, remove completely from the output-->
+	 
+		 <xsl:variable name="href">
+		 	<xsl:apply-templates select="." mode="link">
+				<xsl:with-param name="data" select="$data"/>
+			</xsl:apply-templates>
+		 </xsl:variable>
+		 	 
+		 
+		<xsl:element name="{name()}"> <!-- use this instead of <copy> so xalan doesn't add extra wrong namespaces -->
+			<xsl:apply-templates select="@*" mode="join">
+				<xsl:with-param name="namespaces" select="$namespaces"/>
+			</xsl:apply-templates>
+			<xsl:if test="$display != '' ">
+				<!-- custom attribute to indicate how this is to be represented. Blank indicates normal, hide removes from the output (see above), anything else is put in the attribute --> 
+				<xsl:attribute name="display"><xsl:value-of select="$display"/></xsl:attribute>
+			</xsl:if>
+		 	<xsl:apply-templates select="$data" mode="overlay-attributes">
+				<xsl:with-param name="item" select="current()"/>
+			</xsl:apply-templates>			
+			<xsl:choose>
+				<xsl:when test="$href !='' ">
+					<xsl:variable name="origin" select="."/>
+					<xsl:apply-templates select="document($href,.)/*" mode="join">
+						<xsl:with-param name="origin" select="$origin"/>
+						<xsl:with-param name="data" select="$data"/>
+						<xsl:with-param name="namespaces" select="$namespaces"/>
+						<xsl:with-param name="filename">
+							<xsl:call-template name="joinpath">
+								<xsl:with-param name="file" select="$filename"/>
+								<xsl:with-param name="rel" select="$href"/>
+							</xsl:call-template>					
+						</xsl:with-param>
+						<xsl:with-param name="root">
+								<xsl:value-of select="$root"/>/<xsl:call-template name="lastbefore">
+								<xsl:with-param name="string" select="$href"/>
+							</xsl:call-template>
+						</xsl:with-param>
+					</xsl:apply-templates> 
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:variable name="content">
+						<xsl:apply-templates select="*|comment()" mode="join">
+							<xsl:with-param name="root" select="$root"/>
+							<xsl:with-param name="filename" select="$filename"/>
+							<xsl:with-param name="namespaces" select="$namespaces"/>
+							<xsl:with-param name="data" select="$data"/>
+						</xsl:apply-templates>
+					</xsl:variable>
+					<xsl:apply-templates select="." mode="is-content-filtered"> <!-- add filtered="yes" if some content has been removed -->
+						<xsl:with-param name="content" select="$content"/>
+					</xsl:apply-templates>
+				 	<xsl:apply-templates select="$data" mode="overlay-meta">
+						<xsl:with-param name="item" select="current()"/>
+					</xsl:apply-templates>
+					<xsl:copy-of select="$content"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:element>
+	</xsl:if>
+</xsl:template>
+
+<!-- By default, do nothing. Can override template to add filtered="yes" if need to track what's a placeholder and what's been filtered 
+	implement with param name="content"
+-->
+<xsl:template mode="is-content-filtered" match="*" priority="-2"/>
+
+
+<xsl:template match="@mrp[starts-with(.,'/')] | @bldFile[starts-with(.,'/')] | @base[starts-with(.,'/')]" mode="join">
+	<xsl:copy-of select="."/>
+</xsl:template>
+
+<xsl:template match="@mrp|@bldFile|@base" mode="join">	<xsl:param name="root"/><xsl:param name="filename"/>
+	<xsl:attribute name="{name()}">
+		<xsl:call-template name="joinpath">
+			<xsl:with-param name="file" select="$filename"/>
+			<xsl:with-param name="rel" select="."/>
+		</xsl:call-template>	
+	</xsl:attribute>	
+</xsl:template>
+
+
+<xsl:template match="@href" mode="join"/> <!--never copy this into the generated doc, that's the whole point of this module -->
+
+<xsl:template match="@*" mode="my-namespace"> <!-- the namespace of an ID -->
+	<xsl:choose>
+		<xsl:when test="contains(.,':')">
+			<xsl:value-of select="ancestor::*/namespace::*[name()=substring-before(current(),':')]"/>
+		</xsl:when>
+		<xsl:when test="/SystemDefinition/@id-namespace">
+			<xsl:value-of select="/SystemDefinition/@id-namespace"/>
+		</xsl:when>
+		<xsl:otherwise>
+			<xsl:value-of select="$defaultns"/>
+		</xsl:otherwise>
+	</xsl:choose>
+</xsl:template>
+
+
+<xsl:template match="@*" mode="my-id"> <!-- the ID with namespace prefix removed -->
+	<xsl:choose>
+		<xsl:when test="contains(.,':')">
+			<xsl:value-of select="substring-after(.,':')"/>
+		</xsl:when>
+		<xsl:otherwise>
+			<xsl:value-of select="."/>
+		</xsl:otherwise>
+	</xsl:choose>
+</xsl:template>
+
+<xsl:template match="@id|@before" mode="join">
+	<xsl:param name="namespaces"/>
+	<!-- this will change the namespace prefixes for all IDs to match the root document -->
+	<xsl:variable name="ns">
+		<xsl:apply-templates select="." mode="my-namespace"/>
+	</xsl:variable>
+	<xsl:if test="$ns=''">
+		<xsl:message terminate="yes">Could not find namespace for <xsl:value-of select="."/>
+		</xsl:message>
+	</xsl:if>
+	<xsl:variable name="prefix" select="name($namespaces[.=$ns])"/>
+	<xsl:attribute name="{name()}">
+	<xsl:choose>
+		<xsl:when test="$prefix = 'id-namespace' or  (not($namespaces[name()='id-prefix']) and $ns=$defaultns)"/> <!-- it's the default namespace, no prefix -->
+		<xsl:when test="$prefix='' and contains(.,':')">
+			<!-- complex: copy id and copy namespace (namespace should be copied already)-->
+			<xsl:value-of select="."/>
+		</xsl:when>
+		<xsl:when test="$prefix='' and $ns=$defaultns"/> <!-- no prefix and it's the default --> 
+		<xsl:when test="$prefix!=''">			<!-- just change the prefix -->
+			<xsl:value-of select="concat($prefix,':')"/>
+		</xsl:when>
+		<xsl:otherwise>
+		<xsl:message terminate="yes">Error</xsl:message>
+		</xsl:otherwise>
+	</xsl:choose>
+		<xsl:apply-templates select="." mode="my-id"/>
+	</xsl:attribute>
+</xsl:template>
+
+
+
+<xsl:template match="@*|comment()" mode="join"><xsl:copy-of select="."/></xsl:template>
+
+
+<!-- path handling follows -->
+
+ <xsl:template name="lastbefore"><xsl:param name="string"/><xsl:param name="substr" select="'/'"/>
+        <xsl:if test="contains($string,$substr)">
+                <xsl:value-of select="substring-before($string,$substr)"/>
+                <xsl:if test="contains(substring-after($string,$substr),$substr)">
+	                <xsl:value-of select="$substr"/>
+	              </xsl:if>
+        <xsl:call-template name="lastbefore">
+                <xsl:with-param name="string" select="substring-after($string,$substr)"/>
+                <xsl:with-param name="substr" select="$substr"/>
+        </xsl:call-template>
+        </xsl:if>
+</xsl:template>
+
+ <xsl:template name="joinpath"><xsl:param name="file"/><xsl:param name="rel"/>
+        <xsl:call-template name="reducepath">
+        <xsl:with-param name="file">
+	        <xsl:call-template name="lastbefore">
+	                <xsl:with-param name="string" select="$file"/>
+	        </xsl:call-template>
+	        <xsl:text>/</xsl:text>
+	        <xsl:value-of select="$rel"/>
+	       </xsl:with-param>
+	      </xsl:call-template>
+ </xsl:template>
+
+<xsl:template name="reducepath"><xsl:param name="file"/>
+	<xsl:call-template name="reducedotdotpath">
+    	<xsl:with-param name="file">
+			<xsl:call-template name="reducedotpath">
+		    	<xsl:with-param name="file" select="$file"/>
+		    </xsl:call-template>
+		</xsl:with-param>
+	</xsl:call-template>
+</xsl:template>
+
+<xsl:template name="reducedotdotpath"><xsl:param name="file"/>
+	<xsl:choose>
+		<xsl:when test="starts-with($file,'../')">
+			<xsl:text>../</xsl:text>
+			<xsl:call-template name="reducedotdotpath">
+        		<xsl:with-param name="file" select="substring($file,4)"/>
+			</xsl:call-template>
+		</xsl:when>
+		<xsl:when test="contains($file,'/../')">							
+			<xsl:call-template name="reducepath">
+        		<xsl:with-param name="file">
+			        <xsl:call-template name="lastbefore">
+			                <xsl:with-param name="string" select="substring-before($file,'/../')"/>
+			        </xsl:call-template>
+			        <xsl:text>/</xsl:text>
+					<xsl:value-of select="substring-after($file,'/../')"/>
+				</xsl:with-param>
+			</xsl:call-template>
+		</xsl:when>
+		<xsl:otherwise><xsl:value-of select="$file"/></xsl:otherwise>
+	</xsl:choose>
+ </xsl:template>
+
+<xsl:template name="reducedotpath"><xsl:param name="file"/>
+	<xsl:choose>	
+		<xsl:when test="starts-with($file,'./')">
+			<xsl:call-template name="reducedotpath">
+        		<xsl:with-param name="file" select="substring($file,3)"/>
+			</xsl:call-template>
+		</xsl:when>
+		<xsl:when test="contains($file,'/./')">
+			<xsl:call-template name="reducepath">
+        		<xsl:with-param name="file">
+	                <xsl:value-of select="substring-before($file,'/./')"/>
+			        <xsl:text>/</xsl:text>
+					<xsl:value-of select="substring-after($file,'/./')"/>
+				</xsl:with-param>
+			</xsl:call-template>
+		</xsl:when>
+		<xsl:otherwise><xsl:value-of select="$file"/></xsl:otherwise>
+	</xsl:choose>
+ </xsl:template>
+
+<!-- overridable templates follow -->
+
+
+<xsl:template match="*" mode="filter" priority="-9"/> <!-- by default show --> 
+<xsl:template match="*" mode="overlay-attributes" priority="-9"/> <!-- by default do nothing --> 
+<xsl:template match="*" mode="overlay-meta" priority="-9"/> <!-- by default do nothing --> 
+<xsl:template match="/SystemDefinition" mode="add-id-ns" priority="-9"/> <!-- some tools may have an easier job if this were always present, but, by default, assume it can just stay implied -->
+
+<xsl:template match="*" mode="link" priority="-1"> <!-- can be overriden to allow custom changes to href values --> 
+<xsl:value-of select="@href"/>
+</xsl:template>
+
+
+<xsl:template match="*" mode="meta" priority="-9"><xsl:param name="data"/><xsl:param name="display"/>
+	<xsl:element name="{name()}">
+		<xsl:copy-of select="@*[name()!='href']"/> <!-- copy all attributes as is, always drop href -->
+		<xsl:choose>
+			<xsl:when test="$display='local' and @href and contains(@href,':') and not(starts-with(@href,'file:'))">
+				<!-- non-local URL: only want local URLs, so keep href as is-->
+				<xsl:copy-of select="@href"/> 
+			</xsl:when>
+			<xsl:when test="@href">
+				<xsl:copy-of select="document(@href,.)/*"/> 
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:copy-of select="*|comment()"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:element>
+</xsl:template>
+
+</xsl:stylesheet>
diff -r 2958b22b1b70 -r 9d6a5309852c common/sysdefdowngrade/joinsysdef.xsl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/sysdefdowngrade/joinsysdef.xsl	Tue Jan 26 15:39:24 2010 +0000
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+ <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ 	<xsl:output method="xml" indent="yes"/>
+<!-- create a stand-alone sysdef from a linked set of fragments -->
+
+<xsl:param name="path">/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml</xsl:param>
+
+<xsl:template match="/*">
+	<xsl:apply-templates select="." mode="join"/>
+</xsl:template>
+
+
+<xsl:template match="/SystemDefinition[systemModel]">
+<xsl:apply-templates select="." mode="join">
+	<xsl:with-param name="filename" select="$path"/>
+</xsl:apply-templates>
+</xsl:template>
+
+
+
+
+<xsl:include href="joinsysdef-module.xsl"/>
+
+</xsl:stylesheet>
diff -r 2958b22b1b70 -r 9d6a5309852c common/sysdefdowngrade/sysdefdowngrade.xsl
--- a/common/sysdefdowngrade/sysdefdowngrade.xsl	Thu Jan 14 18:21:21 2010 +0000
+++ b/common/sysdefdowngrade/sysdefdowngrade.xsl	Tue Jan 26 15:39:24 2010 +0000
@@ -1,10 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<?xml version="1.0"?>
+ <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 	<xsl:output method="xml" indent="yes"/>
 	
 	<xsl:param name="Path">os/deviceplatformrelease/foundation_system/system_model</xsl:param>
 	<!-- $Path is the location of the root system definition XML file. Must not end in /
 		This is used to compute the absolute paths the 2.0 syntax needs-->
+	<xsl:param name="Root"/> <!-- space separated list of root variables in the form "VAR1=value1 VAR=value2" --> 
+	<xsl:variable name="root" select="concat(' ',$Root,' ')"/> <!-- sort of hack to allow absolute paths in downgraded output -->
+	<xsl:variable name="srcroot" select="substring-before(substring-after($root,' SRCROOT='),' ')"/> <!-- the default path prefix -->
 
 <xsl:template match="/*">
 	<xsl:message terminate="yes">Cannot process this document</xsl:message>
@@ -53,11 +56,11 @@
 	<!-- comments are copied verbatim. Attribtues are copied by default -->
 
 <xsl:template match="systemModel">
-	<xsl:copy>
+	<systemModel>
   	<xsl:apply-templates select="*|comment()"> <!-- no attributes -->
   		<xsl:with-param name="path" select="$Path"/> <!-- need to keep tack of where the current document is -->
   	</xsl:apply-templates>
-	</xsl:copy>
+	</systemModel>
 </xsl:template>
 
 <xsl:template mode="copy" match="@*">
@@ -91,8 +94,10 @@
 			<xsl:when test="@href">
 				<xsl:variable name="this" select="."/>
 				<xsl:for-each select="document(@href,.)/SystemDefinition/*">
-					<xsl:if test="@id!=$this/@id">
-						<xsl:message terminate="yes">Error: IDs do not match: <xsl:value-of select="@id"/> vs <xsl:value-of select="$this/@id"/></xsl:message>
+					<xsl:variable name="my-id"><xsl:apply-templates mode="normalize-id" select="@id"/></xsl:variable>
+					<xsl:variable name="other-id"><xsl:apply-templates mode="normalize-id" select="$this/@id"/></xsl:variable>
+					<xsl:if test="$my-id != $other-id">
+						<xsl:message terminate="yes">Error: IDs do not match: <xsl:value-of select="$my-id"/> vs <xsl:value-of select="$other-id"/></xsl:message>
 					</xsl:if>
 					<xsl:if test="@name and @name!=@id and not($this/@name and $this/@name=$this/@id)">
 						<!-- set long-name only if name is different from the id and not set in child doc -->
@@ -175,7 +180,7 @@
 		<xsl:apply-templates select="@mrp|@bldFile|@late">
 			<xsl:with-param name="path" select="$path"/> 
 		</xsl:apply-templates>
-		<xsl:copy-of select="@filter|@root|@version|@prebuilt|@priority"/>
+		<xsl:copy-of select="@filter|@root[not(contains($root,concat(' ',.,'=')))]|@version|@prebuilt|@priority"/>
 	</unit>
 </xsl:template>
 
@@ -190,9 +195,18 @@
 
 <xsl:template match="@mrp|@bldFile"><xsl:param name="path"/>
 	<xsl:attribute name="{name()}">
-	<xsl:choose>
+		<xsl:choose>
+			<xsl:when test="../@root">
+				<xsl:variable name="pre" select="substring-before(substring-after($root,concat(' ',../@root,'=')),' ')"/>
+				<xsl:if test="$pre!=''"><xsl:value-of select="concat($pre,'/')"/></xsl:if>
+			</xsl:when>
+			<xsl:when test="$srcroot!=''">
+				<xsl:value-of select="concat($srcroot,'/')"/>
+			</xsl:when>
+		</xsl:choose>
+		<xsl:choose>
 		<xsl:when test="starts-with(.,'/')"> <!-- keep absolute paths verbatim (barring the leading / ) -->
-			<xsl:value-of select="substring-after(substring(.,2),'/')"/>
+			<xsl:value-of select="substring-after(.,'/')"/>
 		</xsl:when>
 		<xsl:otherwise>	
 			<xsl:call-template name="normpath">
@@ -214,6 +228,13 @@
 	<xsl:copy-of select="info/@contract"/>
 </xsl:template>
 
+<xsl:template match="@id" mode="normalize-id">
+	<xsl:choose>
+		<xsl:when test="contains(@id,':')"><xsl:value-of select="substring-after(@id,':')"/></xsl:when>
+		<xsl:otherwise><xsl:value-of select="@id"/></xsl:otherwise>
+	</xsl:choose>
+</xsl:template>
+
 <xsl:template name="class"><xsl:param name="remove"/><xsl:param name="add"/>
 <!--  returns the value of the class attribute with the space-separated list of names in $remove taken out and those in $add added on (does not check for duplicates) -->
 	<xsl:param name="class" select="normalize-space(@class)"/>
@@ -352,4 +373,4 @@
 ]>
 ]]></xsl:text>
 </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff -r 2958b22b1b70 -r 9d6a5309852c common/tools/ats/ats_generate_index.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/ats_generate_index.pl	Tue Jan 26 15:39:24 2010 +0000
@@ -0,0 +1,71 @@
+#!/usr/bin/perl
+
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Symbian Foundation Ltd - initial contribution.
+#   Maciej Seroka, maciej@symbian.org
+#
+# Description:
+#   This is a tool for generating the top-level index for BC test reports.
+
+use strict;
+use File::Copy;
+use Tie::File;
+use File::Find;
+
+my @files;
+my @lines;
+sub Wanted;
+
+my $path;
+if ($ARGV[0]) {
+  $path = $ARGV[0];
+ }
+else { die "Missing parameter \"path\". For example: //v800020/Publish/SF_builds/symbian2/builds/default/symbian2_default.sf-test-bc-check.PDK_2.0.1.51/ats_reports"; }
+
+find(\&Wanted, $path);
+
+#Find and delete the link to Smoke Test Report
+my $n = 0;
+my $item_to_find = $path . "/ATS3Report.html";
+foreach (@files) {
+	if (@files[$n] eq $item_to_find) { splice @files, $n, 1; }
+	$n++;
+}
+
+$n = 0;
+foreach (@files) { #Replace "//v800020/Publish" with "http://cdn.symbian,org"
+	@files[$n] =~ s/\/\/v800020\/Publish/http:\/\/cdn.symbian.org/;
+	$n++;
+}
+
+#Copy template and insert links
+copy("report_template.html","index.html") or die ("Cannot copy file \"report_template.html\". $!\n");
+tie @lines, 'Tie::File', "index.html" or die ("Cannot tie file \"index.html\". $!\n");
+my $current_line = 0;
+for (@lines) {
+	if (/<!-- Insert reports here -->/) {
+		my $i = 0;
+		foreach (@files) {
+			splice @lines, $current_line+$i+1, 0, "<tr class=\"tableData\"><td align=\"center\">" . ($i+1) . "</td>" . "<td align=\"left\"><a href=\"" . @files[$i] . "\">" . @files[$i] . "</a></td></tr>"; 
+			$i++;
+		}
+		last;
+	}
+	$current_line++;
+}
+untie @lines;
+print @{files} . " link(s) added.\n";
+#copy index
+copy("index.html","$path/index.html") or die ("Cannot copy file \"index.html\" to $path. $!\n");
+
+sub Wanted {
+    # only operate on ATS3Report.html files
+	/ATS3Report.html/ or return;
+    push (@files, $File::Find::name);
+}
\ No newline at end of file
diff -r 2958b22b1b70 -r 9d6a5309852c common/tools/ats/bctest/contacts/phonebook/phonebook.xml
--- a/common/tools/ats/bctest/contacts/phonebook/phonebook.xml	Thu Jan 14 18:21:21 2010 +0000
+++ b/common/tools/ats/bctest/contacts/phonebook/phonebook.xml	Tue Jan 26 15:39:24 2010 +0000
@@ -328,7 +328,7 @@
 							<param file="atsinterface.exe"/>
 							<param parameters="-testmodule testcombiner -config C:\TestFramework\tcbctestpbkdatamngt.cfg"/>
                             <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="1800"/>
+                            <param timeout="3600"/>
 						</params>
 					</step>
 					<step id="" name="testpbkdatamngt (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
@@ -678,7 +678,7 @@
 							<param file="atsinterface.exe"/>
 							<param parameters="-testmodule testcombiner -config c:\testframework\tcbctestpbkfetch.cfg"/>
                             <param result-file="c:\spd_logs\xml\testcombiner.xml"/>
-                            <param timeout="1800"/>
+                            <param timeout="3600"/>
 						</params>
 					</step>
 					<step id="" name="testpbkfetch (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
diff -r 2958b22b1b70 -r 9d6a5309852c common/tools/ats/bctest/locationsrv/locaqu/locaqu.xml
--- a/common/tools/ats/bctest/locationsrv/locaqu/locaqu.xml	Thu Jan 14 18:21:21 2010 +0000
+++ b/common/tools/ats/bctest/locationsrv/locaqu/locaqu.xml	Tue Jan 26 15:39:24 2010 +0000
@@ -62,7 +62,7 @@
 							<param file="atsinterface.exe"/>
 							<param parameters="-testmodule testscripter -config c:\testframework\testlbslocacquisition.cfg"/>
 							<param result-file="c:\spd_logs\xml\testscripter.xml"/>
-                            <param timeout="1200"/>
+                            <param timeout="3600"/>
 						</params>
 					</step>
 					<step id="" name="testlbslocacquisition (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
diff -r 2958b22b1b70 -r 9d6a5309852c common/tools/ats/bctest/websrv/websrv.pl
--- a/common/tools/ats/bctest/websrv/websrv.pl	Thu Jan 14 18:21:21 2010 +0000
+++ b/common/tools/ats/bctest/websrv/websrv.pl	Tue Jan 26 15:39:24 2010 +0000
@@ -40,7 +40,7 @@
 copy($epoc . "winscw/c/testframework/testframework_senservicemanager.ini",  "temp/bcwebsrv/general/testframework/testframework_senservicemanager.ini") or die "failed : $!";
 copy($epoc . "release/winscw/udeb/SenUtilsBCTest.dll",                      "temp/bcwebsrv/winscw_udeb/SenUtilsBCTest.dll") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/testframework_senutils.ini",           "temp/bcwebsrv/general/testframework/testframework_senutils.ini") or die "failed : $!";
-copy($epoc . "release/winscw/udeb/SenFragmentTester.dll",                   "temp/bcwebsrv/winscw_udeb/SenFragmentBCTest.dll") or die "failed : $!";
-#copy($epoc . "winscw/c/testframework/TestFramework_senfragment.ini",        "temp/bcwebsrv/general/testframework/TestFramework_senfragment.ini") or die "failed : $!";
+copy($epoc . "release/winscw/udeb/SenFragmentBCTest.dll",                   "temp/bcwebsrv/winscw_udeb/SenFragmentBCTest.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/TestFramework_senfragment.ini",        "temp/bcwebsrv/general/testframework/TestFramework_senfragment.ini") or die "failed : $!";
 
 system("7z a -tzip websrv.zip ./temp/*");
\ No newline at end of file
diff -r 2958b22b1b70 -r 9d6a5309852c common/tools/ats/bctest/websrv/websrv.xml
--- a/common/tools/ats/bctest/websrv/websrv.xml	Thu Jan 14 18:21:21 2010 +0000
+++ b/common/tools/ats/bctest/websrv/websrv.xml	Tue Jan 26 15:39:24 2010 +0000
@@ -94,7 +94,7 @@
 							<param file="atsinterface.exe"/>
 							<param parameters="-testmodule HostletConnectionBCTest"/>
 							<param result-file="c:\spd_logs\xml\HostletConnectionBCTest.xml"/>
-                            <param timeout="3600"/>
+                            <param timeout="1200"/>
 						</params>
 					</step>
 					<step id="" name="HostletConnectionBCTest (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
@@ -284,6 +284,15 @@
 							<param component-path="bcwebsrv" />
 						</params>
 					</step>
+					<step id="" name="testframework_senfragment.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework\testframework_senfragment.ini"/>
+							<param dst="c:\testframework\testframework_senfragment.ini"/>
+							<param component-path="bcwebsrv" />
+						</params>
+					</step>
 					<step id="" name="SenFragmentBCTest (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
 						<command>execute</command>
 						<params>
@@ -317,5 +326,6 @@
 		<file>bcwebsrv/winscw_udeb/SenUtilsBCTest.dll</file>
 		<file>bcwebsrv/general/testframework/testframework_senutils.ini</file>
 		<file>bcwebsrv/winscw_udeb/SenFragmentBCTest.dll</file>
+		<file>bcwebsrv/general/testframework/testframework_senfragment.ini</file>
 	</files>
 </test>
\ No newline at end of file
diff -r 2958b22b1b70 -r 9d6a5309852c common/tools/ats/report_dummy.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/report_dummy.html	Tue Jan 26 15:39:24 2010 +0000
@@ -0,0 +1,142 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>
+ATS3 generated test report
+</title>
+<style>
+body
+{
+background-color:#ffffff;
+margin:0px;
+color:black;
+font-family: verdana, arial, sans-serif;
+font-size: 24px;
+}
+td
+{
+font-family: verdana, arial, tahoma;
+font-size: 12px;
+}
+.tableHeader
+{
+background-color: #7383DF;
+font-family: verdana, arial, tahoma;
+font-size: 11px;
+font-weight: bold;
+color: #ffffff;
+}
+.tableData
+{
+background-color: #ffffff;
+}
+.legendPassed
+{
+background-color: #90ff90;
+border: 1px solid #e6e6e6;
+}
+.legendFailed
+{
+background-color: #ff9090;
+border: 1px solid #e6e6e6;
+}
+.legendSkipped
+{
+background-color: #9090ff;
+border: 1px solid #e6e6e6;
+}
+.legendNoResult
+{
+background-color: #ffbb90;
+border: 1px solid #e6e6e6;
+}
+.legendDisabled
+{
+background-color: #b0b0b0;
+border: 1px solid #e6e6e6;
+}
+.passed
+{
+background-color: #90ff90;
+}
+.failed
+{
+background-color: #ff9090;
+}
+.skipped
+{
+background-color: #9090ff;
+}
+.noResult
+{
+background-color: #ffbb90;
+}
+.disabled
+{
+background-color: #b0b0b0;
+}
+div.passed {
+font-size: 12px;
+background-color: #90ff90;
+border-top: 0px;
+border-bottom: 1px solid #e6e6e6;
+border-left: 0px;
+border-right: 0px;
+padding:4px;
+}
+div.failed {
+font-size: 12px;
+background-color: #ff9090;
+border-top: 0px;
+border-bottom: 1px solid #e6e6e6;
+border-left: 0px;
+border-right: 0px;
+padding:4px;
+}
+div.skipped {
+font-size: 12px;
+background-color: #9090ff;
+border-top: 0px;
+border-bottom: 1px solid #e6e6e6;
+border-left: 0px;
+border-right: 0px;
+padding:4px;
+}
+div.noResult {
+font-size: 12px;
+background-color: #ffbb90;
+border-top: 0px;
+border-bottom: 1px solid #e6e6e6;
+border-left: 0px;
+border-right: 0px;
+padding:4px;
+}
+div.disabled {
+font-size: 12px;
+background-color: #b0b0b0;
+border-top: 0px;
+border-bottom: 1px solid #e6e6e6;
+border-left: 0px;
+border-right: 0px;
+padding:4px;
+}
+a
+{
+text-decoration: underline;
+color: #000000;
+}
+a:hover
+{
+text-decoration: underline;
+color: #000000;
+}
+</style>
+</head>
+<body>
+<div>
+<p>Execution in progress...</p>
+<p>No results available yet.</p>
+</div>
+</body>
+</html>
diff -r 2958b22b1b70 -r 9d6a5309852c common/tools/ats/report_template.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/report_template.html	Tue Jan 26 15:39:24 2010 +0000
@@ -0,0 +1,152 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>
+ATS3 generated test report
+</title>
+<style>
+body
+{
+background-color:#ffffff;
+margin:0px;
+color:black;
+font-family: verdana, arial, sans-serif;
+font-size: 12px;
+}
+td
+{
+font-family: verdana, arial, tahoma;
+font-size: 12px;
+}
+.tableHeader
+{
+background-color: #7383DF;
+font-family: verdana, arial, tahoma;
+font-size: 11px;
+font-weight: bold;
+color: #ffffff;
+}
+.tableData
+{
+background-color: #ffffff;
+}
+.legendPassed
+{
+background-color: #90ff90;
+border: 1px solid #e6e6e6;
+}
+.legendFailed
+{
+background-color: #ff9090;
+border: 1px solid #e6e6e6;
+}
+.legendSkipped
+{
+background-color: #9090ff;
+border: 1px solid #e6e6e6;
+}
+.legendNoResult
+{
+background-color: #ffbb90;
+border: 1px solid #e6e6e6;
+}
+.legendDisabled
+{
+background-color: #b0b0b0;
+border: 1px solid #e6e6e6;
+}
+.passed
+{
+background-color: #90ff90;
+}
+.failed
+{
+background-color: #ff9090;
+}
+.skipped
+{
+background-color: #9090ff;
+}
+.noResult
+{
+background-color: #ffbb90;
+}
+.disabled
+{
+background-color: #b0b0b0;
+}
+div.passed {
+font-size: 12px;
+background-color: #90ff90;
+border-top: 0px;
+border-bottom: 1px solid #e6e6e6;
+border-left: 0px;
+border-right: 0px;
+padding:4px;
+}
+div.failed {
+font-size: 12px;
+background-color: #ff9090;
+border-top: 0px;
+border-bottom: 1px solid #e6e6e6;
+border-left: 0px;
+border-right: 0px;
+padding:4px;
+}
+div.skipped {
+font-size: 12px;
+background-color: #9090ff;
+border-top: 0px;
+border-bottom: 1px solid #e6e6e6;
+border-left: 0px;
+border-right: 0px;
+padding:4px;
+}
+div.noResult {
+font-size: 12px;
+background-color: #ffbb90;
+border-top: 0px;
+border-bottom: 1px solid #e6e6e6;
+border-left: 0px;
+border-right: 0px;
+padding:4px;
+}
+div.disabled {
+font-size: 12px;
+background-color: #b0b0b0;
+border-top: 0px;
+border-bottom: 1px solid #e6e6e6;
+border-left: 0px;
+border-right: 0px;
+padding:4px;
+}
+a
+{
+text-decoration: underline;
+color: #000000;
+}
+a:hover
+{
+text-decoration: underline;
+color: #000000;
+}
+</style>
+</head>
+<body>
+<div>
+<!-- Summary -->
+<div id="summary" style="margin:8px 16px 8px 16px;">
+<table cellpadding="0" cellspacing="0" border="0">
+<tr><td><b>&nbsp;</b></td></tr>
+</table>
+<table cellpadding="4" cellspacing="1" border="0" bgcolor="#e6e6e6">
+<tr class="tableHeader">
+<td>&nbsp;</td>
+<td>Binary Compatibility Test Reports</td>
+</tr>
+<!-- Insert reports here -->
+</table>
+</div>
+</body>
+</html>
diff -r 2958b22b1b70 -r 9d6a5309852c common/tools/ats/smoketest/Group/bld.inf
--- a/common/tools/ats/smoketest/Group/bld.inf	Thu Jan 14 18:21:21 2010 +0000
+++ b/common/tools/ats/smoketest/Group/bld.inf	Tue Jan 26 15:39:24 2010 +0000
@@ -34,3 +34,4 @@
 #include "../localisation/apparchitecture/group/BLD.INF"
 #include "../graphics/wserv/group/bld.inf"
 #include "../http/group/bld.inf"
+#include "../mediamgmt/group/Bld.inf"
\ No newline at end of file
diff -r 2958b22b1b70 -r 9d6a5309852c common/tools/ats/smoketest/Group/smoketest.pl
--- a/common/tools/ats/smoketest/Group/smoketest.pl	Thu Jan 14 18:21:21 2010 +0000
+++ b/common/tools/ats/smoketest/Group/smoketest.pl	Tue Jan 26 15:39:24 2010 +0000
@@ -136,5 +136,8 @@
 copy($epoc . "winscw/c/smoketest/InputMethodSmokeTestModule.cfg",   "temp/smoketest/general/InputMethodSmokeTestModule.cfg");
 copy($epoc . "release/winscw/udeb/IMApiTest.dll",					"temp/smoketest/winscw_udeb/IMApiTest.dll");
 copy($epoc . "data/c/smoketest/imapitest.ini",						"temp/smoketest/general/imapitest.ini");
+copy($epoc . "release/winscw/udeb/MediaMgmtSmokeTestModule.dll",	"temp/smoketest/winscw_udeb/MediaMgmtSmokeTestModule.dll");
+copy($epoc . "winscw/c/smoketest/UI_MediaMgmtSmokeTestModule.cfg",  "temp/smoketest/general/UI_MediaMgmtSmokeTestModule.cfg");
+copy($epoc . "winscw/c/smoketest/MediaMgmtSmokeTestModule.cfg",   	"temp/smoketest/general/MediaMgmtSmokeTestModule.cfg");
 
 system("7z a -tzip smoketest.zip ./temp/*");
diff -r 2958b22b1b70 -r 9d6a5309852c common/tools/ats/smoketest/Group/smoketest.xml
--- a/common/tools/ats/smoketest/Group/smoketest.xml	Thu Jan 14 18:21:21 2010 +0000
+++ b/common/tools/ats/smoketest/Group/smoketest.xml	Tue Jan 26 15:39:24 2010 +0000
@@ -995,7 +995,6 @@
 							<param component-path="smoketest" />
 						</params>
 					</step>
-					
 					<step id="" name="IMApiTest.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -1014,6 +1013,33 @@
 							<param component-path="smoketest" />
 						</params>
 					</step>
+					<step id="" name="MediaMgmtSmokeTestModule.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="MediaMgmtSmokeTestModule.dll"/>
+							<param dst="c:\sys\bin\MediaMgmtSmokeTestModule.dll"/>
+							<param component-path="smoketest" />
+						</params>
+					</step>
+                    <step id="" name="UI_MediaMgmtSmokeTestModule.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="UI_MediaMgmtSmokeTestModule.cfg"/>
+							<param dst="c:\smoketest\UI_MediaMgmtSmokeTestModule.cfg"/>
+							<param component-path="smoketest" />
+						</params>
+					</step>
+                    <step id="" name="MediaMgmtSmokeTestModule.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="MediaMgmtSmokeTestModule.cfg"/>
+							<param dst="c:\smoketest\MediaMgmtSmokeTestModule.cfg"/>
+							<param component-path="smoketest" />
+						</params>
+					</step>
 					<step id="" name="ProfileSmokeTestModule (execute)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="true">
 						<command>execute</command>
 						<params>
@@ -1068,7 +1094,16 @@
 							<param timeout="600"/>
 						</params>
 					</step>
-                </case>
+					<step id="" name="MediaMgmtSmokeTestModule (execute)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="true">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testcombiner -config c:\smoketest\MediaMgmtSmokeTestModule.cfg"/>
+							<param result-file="c:\spd_logs\xml\testcombiner.xml"/>
+							<param timeout="600"/>
+						</params>
+					</step>
+				</case>
             </set>
 		</session>
 	</plan>
@@ -1182,7 +1217,10 @@
 		<file>smoketest/wallpaper/general/symbian_01_320x480.jpg</file>
         <file>smoketest/winscw_udeb/InputMethodSmokeTestModule.dll</file>
         <file>smoketest/general/InputMethodSmokeTestModule.cfg</file>
-		<file>smoketest/winscw_udeb/IMApiTest.dll</file>		
+		<file>smoketest/winscw_udeb/IMApiTest.dll</file>	
 		<file>smoketest/general/imapitest.ini</file>
+		<file>smoketest/winscw_udeb/MediaMgmtSmokeTestModule.dll</file>
+		<file>smoketest/general/UI_MediaMgmtSmokeTestModule.cfg</file>
+		<file>smoketest/general/MediaMgmtSmokeTestModule.cfg</file>
 	</files>
 </test>
diff -r 2958b22b1b70 -r 9d6a5309852c common/tools/raptor/preprocess_log.pl
--- a/common/tools/raptor/preprocess_log.pl	Thu Jan 14 18:21:21 2010 +0000
+++ b/common/tools/raptor/preprocess_log.pl	Tue Jan 26 15:39:24 2010 +0000
@@ -46,6 +46,10 @@
 	{
 		$line = unterminated_archive_tag($line, scalar <>, $.)
 	}
+	elsif ($line =~ m{make.exe: Circular .* <- .* dependency dropped.})
+	{
+		$line = escape_left_angle_bracket($line);
+	}
 	
 	print $line;
 }
@@ -92,3 +96,16 @@
 	
 	return $line . $nextLine;
 }
+
+sub escape_left_angle_bracket
+{
+	my ($line) = @_;
+	
+	warn "escape_left_angle_bracket\n";
+	warn "in: $line";
+	
+	$line =~ s,<,&lt;,g;
+	
+	warn "out: $line";
+	return $line;
+}
diff -r 2958b22b1b70 -r 9d6a5309852c sf-package/CompilerCompatibility_props.ant.xml
--- a/sf-package/CompilerCompatibility_props.ant.xml	Thu Jan 14 18:21:21 2010 +0000
+++ b/sf-package/CompilerCompatibility_props.ant.xml	Tue Jan 26 15:39:24 2010 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
 <project name="COMPILERCOMPATIBILITY-PROPS">
-  <property name="sf.spec.baseline.location" value="\\bishare\Releases\PDK_3.0.e"/>
+  <property name="sf.spec.baseline.location" value="\\bishare\Releases\PDK_3.0.d"/>
 </project>
 
diff -r 2958b22b1b70 -r 9d6a5309852c sf-package/NewGraphicsArchitecture_props.ant.xml
--- a/sf-package/NewGraphicsArchitecture_props.ant.xml	Thu Jan 14 18:21:21 2010 +0000
+++ b/sf-package/NewGraphicsArchitecture_props.ant.xml	Tue Jan 26 15:39:24 2010 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
 <project name="NEWGRAPHICSARCHITECTURE-PROPS">
-  <property name="sf.spec.baseline.location" value="\\bishare\Releases\PDK_3.0.e"/>
+  <property name="sf.spec.baseline.location" value="\\bishare\Releases\PDK_3.0.d"/>
 </project>
 
diff -r 2958b22b1b70 -r 9d6a5309852c sf-package/package_props.ant.xml
--- a/sf-package/package_props.ant.xml	Thu Jan 14 18:21:21 2010 +0000
+++ b/sf-package/package_props.ant.xml	Tue Jan 26 15:39:24 2010 +0000
@@ -28,6 +28,8 @@
   <property name="sf.spec.sbs.numberofjobs" value="2"/>
   
   <property name="sf.spec.logs.raptorfilter.enable" value="false"/>
+  
+  <property name="sf.spec.smoketest.enable" value="false"/> <!-- This disables publishing Smoke Test Report -->
 
 </project>
 
diff -r 2958b22b1b70 -r 9d6a5309852c sf-package/symbian3_props.ant.xml
--- a/sf-package/symbian3_props.ant.xml	Thu Jan 14 18:21:21 2010 +0000
+++ b/sf-package/symbian3_props.ant.xml	Tue Jan 26 15:39:24 2010 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
 <project name="SYMBIAN3-PROPS">
-  <property name="sf.spec.baseline.location" value="\\bishare\Releases\PDK_3.0.e"/>
+  <property name="sf.spec.baseline.location" value="\\bishare\Releases\PDK_3.0.d"/>
 </project>