--- a/symbian3/os/osrndtools/package_definition_3.0.xml	Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/os/osrndtools/package_definition_3.0.xml	Wed Feb 03 20:06:22 2010 +0000
@@ -2,6 +2,9 @@
 <SystemDefinition schema="3.0.0">
  <package id="osrndtools" name="OS R&amp;D tools" levels="fw trace">
   <collection id="stif" name="STIF" level="fw">
+    <component id="stif_plat" filter="s60" name="STIF Platform Interfaces" class="api" purpose="development">
+      <unit bldFile="stif/stif_plat/group"/>
+    </component>
    <component id="testinterface" filter="s60" name="Test Interface" purpose="development">
     <unit bldFile="stif/testinterface/group"/>
    </component>
@@ -39,25 +42,21 @@
     <unit bldFile="stif/suevent/group"/>
    </component>
    <component id="stifkerneltestclassbase" filter="s60" name="STIF Kernel Test Class Base" purpose="development">
-    <unit bldFile="stif/stifkerneltestclassbase/group"/>
-   </component>
-   <component id="examples" filter="s60" name="STIF Examples" purpose="development">
-    <!-- <unit bldFile="stif/examples/stiftestmeasurementstub/group"/> -->
-    <!-- <unit bldFile="stif/examples/stifhwresetstub/group"/> -->
-   </component>
-   <component id="testmoduletemplates" filter="s60" name="Test Module Templates" purpose="development">
-    <!-- <unit bldFile="stif/testmoduletemplates/templatescriptxxx/group"/> -->
-    <!-- <unit bldFile="stif/testmoduletemplates/templatekernelscriptxxx/group"/> -->
-    <!-- <unit bldFile="stif/testmoduletemplates/capsmodifierxxx/group"/> -->
-    <!-- <unit bldFile="stif/testmoduletemplates/testmodulexxx/group"/> -->
-    <!-- <unit bldFile="stif/testmoduletemplates/stifunitxxx/group"/> -->
-    <!-- <unit bldFile="stif/testmoduletemplates/hardcodedtestmodulexxx/group"/> -->
+      	<meta rel="config">
+      		<defined condition="__S60_"/>
+      	</meta>
+      	<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
+        <!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
    </component>
    <component id="stif_build" filter="s60" name="STIF Build" purpose="development">
+   	<!--  move exports into self-contained component. Remove this when configuration is in place-->
     <unit bldFile="stif/group"/>
    </component>
   </collection>
   <collection id="memspy" name="Memspy" level="trace">
+    <component id="memspy_plat" filter="s60" name="Memspy Platform Interfaces" class="api" purpose="development">
+      <unit bldFile="memspy/memspy_plat/group"/>
+    </component>
    <component id="driver" filter="s60" name="Memspy Driver" purpose="development">
     <unit bldFile="memspy/driver/group"/>
    </component>
@@ -71,19 +70,41 @@
     <unit bldFile="memspy/console/group"/>
    </component>
    <component id="memspy_build" filter="s60" name="Memspy Build" purpose="development">
+   	<!--  move exports into self-contained component.-->
     <unit bldFile="memspy/group"/>
    </component>
   </collection>
   <collection id="hti" name="Harmonized Test Interface" level="trace">
-   <component id="htiframework" filter="s60" name="HTI Framework" purpose="development">
-    <unit bldFile="hti/htiframework/group"/>
-   </component>
+    <component id="hti_plat" filter="s60" name="HTI Platform Interfaces" class="api" purpose="development">
+      <unit bldFile="hti/hti_plat/group"/>
+    </component>
    <component id="hticfg" filter="s60" name="HTI Config" purpose="development">
     <unit bldFile="hti/hticfg/group"/>
    </component>
    <component id="htiautostart" filter="s60" name="HTI Autostart" purpose="development">
     <unit bldFile="hti/htiautostart/group"/>
    </component>
+   <component id="htiframework" filter="s60" name="HTI Framework" purpose="development">
+    <unit bldFile="hti/htiframework/group"/>
+   </component>
+
+   <component id="hticommplugins" filter="s60" name="HTI Communication Plugins" purpose="development" class="plugin">
+   	<!-- need to #include these from a single unit or separate into component at the right directory level -->
+		<unit bldFile="hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
+		<unit bldFile="hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
+		<unit bldFile="hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
+		<unit bldFile="hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
+   </component>
+   <component id="htiserviceplugins" filter="s60" name="HTI Service Plugins" purpose="development" class="plugin">
+   	<!-- need to #include these from a single unit or separate into component at the right directory level -->
+		<unit bldFile="hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
+		<unit bldFile="hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
+		<unit bldFile="hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
+		<unit bldFile="hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
+		<unit bldFile="hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
+   </component>
+
+
    <component id="htifilehlp" filter="s60" name="HTI File Help" purpose="development">
     <unit bldFile="hti/htifilehlp/group"/>
    </component>
@@ -91,6 +112,7 @@
     <unit bldFile="hti/htiwatchdog/group"/>
    </component>
    <component id="hti_build" filter="s60" name="HTI Build" purpose="development">
+   	<!--  move exports into self-contained component.-->
     <unit bldFile="hti/group"/>
    </component>
   </collection>
@@ -104,9 +126,7 @@
     </collection>
     <collection id="osrndtools_info" name="OS R&amp;D tools Info" level="trace">
       <component id="osrndtools_plat" filter="s60" name="OS R&amp;D tools Platform Interfaces" class="api" purpose="development">
-        <unit bldFile="osrndtools_plat/group"/>
-          <!-- need to #include the next bld.inf  in the above one -->
-        <unit bldFile="osrndtools_plat/hti_api/group"/>
+        <unit bldFile="osrndtools_plat/group"/>	<!-- currently empty. Remove? -->
       </component>
       <component id="osrndtools_metadata" name="OS R&amp;D tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
         <unit mrp="osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>