# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1266841098 0
# Node ID 5625a635abf62f0968dcbace9d26d804b63d73f5
# Parent  519ca14792dbee1dd48162d5f6da36e2635c7eb0
Fixes for missing units in app and mw layers

diff -r 519ca14792db -r 5625a635abf6 symbian3/app/conversations/package_definition.xml
--- a/symbian3/app/conversations/package_definition.xml	Mon Feb 22 12:04:46 2010 +0000
+++ b/symbian3/app/conversations/package_definition.xml	Mon Feb 22 12:18:18 2010 +0000
@@ -137,7 +137,8 @@
             <unit bldFile="/sf/app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
           </component>
           <component name="themes" filter="s60" long-name="Service Widget Themes" class="config">
-            <unit bldFile="/sf/app/conversations/servicewidget/themes/install-themes/install/servicewidget/group"/>
+            <!-- does this really need to have that number in the directory name? -->
+            <unit bldFile="/sf/app/conversations/servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
           </component>
           <component name="servicewidget_build" filter="s60" long-name="Service Widget Build">
             <!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
diff -r 519ca14792db -r 5625a635abf6 symbian3/app/conversations/package_definition_3.0.xml
--- a/symbian3/app/conversations/package_definition_3.0.xml	Mon Feb 22 12:04:46 2010 +0000
+++ b/symbian3/app/conversations/package_definition_3.0.xml	Mon Feb 22 12:18:18 2010 +0000
@@ -61,7 +61,8 @@
         <unit bldFile="servicewidget/servicewidgetdatapublisher/group"/>
       </component>
       <component id="themes" filter="s60" name="Service Widget Themes" class="config">
-        <unit bldFile="servicewidget/themes/install-themes/install/servicewidget/group"/>
+		<!-- does this really need to have that number in the directory name? -->
+        <unit bldFile="servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
       </component>
       <component id="servicewidget_build" filter="s60" name="Service Widget Build">
       	<!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
diff -r 519ca14792db -r 5625a635abf6 symbian3/app/homescreentools/package_definition.xml
--- a/symbian3/app/homescreentools/package_definition.xml	Mon Feb 22 12:04:46 2010 +0000
+++ b/symbian3/app/homescreentools/package_definition.xml	Mon Feb 22 12:18:18 2010 +0000
@@ -81,26 +81,26 @@
           <!-- collection is really a component. Needs to be moved down a directory -->
           <!-- this needs to be built first, does build order need to be forced with filters? -->
           <component name="dtdinstaller_build" filter="s60" long-name="DTD Installer Build" class="tool PC">
-            <unit bldFile="/sf/tools/homescreentools/dtdinstaller/group"/>
+            <unit bldFile="/sf/app/homescreentools/dtdinstaller/group"/>
           </component>
         </collection>
         <collection name="themeinstaller" long-name="Theme Installer" level="install">
           <!-- collection is really a component. Needs to be moved down a directory -->
           <component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-            <unit bldFile="/sf/tools/homescreentools/themeinstaller/group"/>
+            <unit bldFile="/sf/app/homescreentools/themeinstaller/group"/>
           </component>
         </collection>
         <collection name="widgettools" long-name="Widget Tools" level="install">
           <component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-            <unit bldFile="/sf/tools/homescreentools/widgettools/hspluginpreinstaller/group"/>
+            <unit bldFile="/sf/app/homescreentools/widgettools/hspluginpreinstaller/group"/>
           </component>
           <component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-            <unit bldFile="/sf/tools/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
+            <unit bldFile="/sf/app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
           </component>
         </collection>
         <collection name="themetool" long-name="Theme Tool" level="tool">
           <component name="themetool_build" filter="s60" long-name="Theme Tool Build" class="tool PC">
-            <unit bldFile="/sf/tools/homescreentools/themetool/group"/>
+            <unit bldFile="/sf/app/homescreentools/themetool/group"/>
           </component>
         </collection>
       </block>
diff -r 519ca14792db -r 5625a635abf6 symbian3/app/homescreentools/package_definition_3.0.xml
--- a/symbian3/app/homescreentools/package_definition_3.0.xml	Mon Feb 22 12:04:46 2010 +0000
+++ b/symbian3/app/homescreentools/package_definition_3.0.xml	Mon Feb 22 12:18:18 2010 +0000
@@ -5,26 +5,26 @@
     	<!-- collection is really a component. Needs to be moved down a directory -->
     	<!-- this needs to be built first, does build order need to be forced with filters? -->
       <component id="dtdinstaller_build" filter="s60" name="DTD Installer Build" target="desktop" class="tool">
-        <unit bldFile="/tools/homescreentools/dtdinstaller/group"/>
+        <unit bldFile="dtdinstaller/group"/>
       </component>
     </collection>
     <collection id="themeinstaller" name="Theme Installer" level="install">
     	<!-- collection is really a component. Needs to be moved down a directory -->
       <component id="themeinstaller_build" filter="s60" name="Theme Installer Build" target="desktop" class="tool">
-        <unit bldFile="/tools/homescreentools/themeinstaller/group"/>
+        <unit bldFile="themeinstaller/group"/>
       </component>
     </collection>
     <collection id="widgettools" name="Widget Tools" level="install">
       <component id="hspluginpreinstaller" filter="s60" name="HS Plugin Preinstaller" target="desktop" class="tool" introduced="^3">
-        <unit bldFile="/tools/homescreentools/widgettools/hspluginpreinstaller/group"/>
+        <unit bldFile="widgettools/hspluginpreinstaller/group"/>
       </component>
       <component id="wrtwidgetpreinstaller" filter="s60" name="WRT Widget Preinstaller" target="desktop" class="tool" introduced="^3">
-        <unit bldFile="/tools/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
+        <unit bldFile="widgettools/wrtwidgetpreinstaller/group"/>
       </component>
     </collection>
     <collection id="themetool" name="Theme Tool" level="tool">
       <component id="themetool_build" filter="s60" name="Theme Tool Build"  target="desktop" class="tool">
-        <unit bldFile="/tools/homescreentools/themetool/group"/>
+        <unit bldFile="themetool/group"/>
       </component>
     </collection>
   </package>
diff -r 519ca14792db -r 5625a635abf6 symbian3/mw/ipconnmgmt/package_definition.xml
--- a/symbian3/mw/ipconnmgmt/package_definition.xml	Mon Feb 22 12:04:46 2010 +0000
+++ b/symbian3/mw/ipconnmgmt/package_definition.xml	Mon Feb 22 12:18:18 2010 +0000
@@ -102,12 +102,11 @@
           <component name="mpm" filter="s60" long-name="Mobility Policy Manager">
             <unit bldFile="/sf/mw/ipconnmgmt/bearermanagement/mpm/group"/>
           </component>
-          <component name="bearermanager" filter="s60" long-name="Bearer Manager">
-            <unit bldFile="/sf/mw/ipconnmgmt/bearermanagement/bearermanager/group"/>
+          <component name="extendedconnpref" filter="s60" long-name="Extended Connection Preferences">
+            <unit bldFile="/sf/mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
           </component>
-          <component name="bearermanagement_build" filter="s60" long-name="Bearer Management Build">
-            <!-- move exports into one of the other components and remove this one -->
-            <unit bldFile="/sf/mw/ipconnmgmt/bearermanagement/group"/>
+          <component name="s60mcpr" filter="s60" long-name="S60 Meta-Connection Provider" plugin="Y">
+            <unit bldFile="/sf/mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
           </component>
         </collection>
         <collection name="cmmanager" long-name="Connection Method Manager" level="framework">
diff -r 519ca14792db -r 5625a635abf6 symbian3/mw/ipconnmgmt/package_definition_3.0.xml
--- a/symbian3/mw/ipconnmgmt/package_definition_3.0.xml	Mon Feb 22 12:04:46 2010 +0000
+++ b/symbian3/mw/ipconnmgmt/package_definition_3.0.xml	Mon Feb 22 12:18:18 2010 +0000
@@ -26,12 +26,11 @@
       <component id="mpm" filter="s60" name="Mobility Policy Manager">
         <unit bldFile="bearermanagement/mpm/group"/>
       </component>
-      <component id="bearermanager" filter="s60" name="Bearer Manager">
-        <unit bldFile="bearermanagement/bearermanager/group"/>
+      <component id="extendedconnpref" filter="s60" name="Extended Connection Preferences">
+        <unit bldFile="bearermanagement/extendedconnpref/group"/>
       </component>
-      <component id="bearermanagement_build" filter="s60" name="Bearer Management Build">
-		<!-- move exports into one of the other components and remove this one -->
-        <unit bldFile="bearermanagement/group"/>
+      <component id="s60mcpr" filter="s60" name="S60 Meta-Connection Provider" class="plugin">
+        <unit bldFile="bearermanagement/S60MCPR/group"/>
       </component>
     </collection>
     <collection id="cmmanager" name="Connection Method Manager" level="framework">
diff -r 519ca14792db -r 5625a635abf6 symbian3/mw/vpnclient/package_definition.xml
--- a/symbian3/mw/vpnclient/package_definition.xml	Mon Feb 22 12:04:46 2010 +0000
+++ b/symbian3/mw/vpnclient/package_definition.xml	Mon Feb 22 12:18:18 2010 +0000
@@ -169,7 +169,7 @@
             <unit bldFile="/sf/mw/vpnclient/vpnengine/dmadpki/group" filter="!oem_build"/>
           </component>
           <component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-            <unit bldFile="/sf/mw/vpnclient/vpnengine/ikesocketplugin/group" filter="!oem_build"/>
+            <unit bldFile="/sf/mw/vpnclient/vpnengine/ikesocket/group" filter="!oem_build"/>
           </component>
         </collection>
         <collection name="vpnui" long-name="VPN UI" level="ui">
diff -r 519ca14792db -r 5625a635abf6 symbian3/mw/vpnclient/package_definition_3.0.xml
--- a/symbian3/mw/vpnclient/package_definition_3.0.xml	Mon Feb 22 12:04:46 2010 +0000
+++ b/symbian3/mw/vpnclient/package_definition_3.0.xml	Mon Feb 22 12:18:18 2010 +0000
@@ -96,7 +96,7 @@
         <unit bldFile="vpnengine/dmadpki/group" filter="!oem_build"/>
       </component>
       <component id="ikesocket" filter="s60" name="IKE Socket" introduced="^3">
-        <unit bldFile="vpnengine/ikesocketplugin/group" filter="!oem_build"/>
+        <unit bldFile="vpnengine/ikesocket/group" filter="!oem_build"/>
       </component>
     </collection>
     <collection id="vpnui" name="VPN UI" level="ui">