--- a/symbian4/mw/web/package_definition.xml	Sat Jun 26 14:31:58 2010 +0100
+++ b/symbian4/mw/web/package_definition.xml	Tue Jun 29 12:34:13 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
@@ -127,12 +127,6 @@
 <unit bldFile="/sf/mw/web/web_plat/xml_parser_api/group"/>
 </component>
 </collection>
-<collection name="web_info" long-name="Web Info" level="specific">
-<component name="web_build" filter="s60" long-name="Web Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="/sf/mw/web/group"/>
-</component>
-</collection>
 <collection name="browserutilities" long-name="Browser Utilities" level="utils">
 <component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
 <unit bldFile="/sf/mw/web/browserutilities/browserdialogsprovider/group"/>
@@ -162,8 +156,7 @@
 <unit bldFile="/sf/mw/web/browserutilities/feedsengine/group"/>
 </component>
 <component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
+<unit bldFile="/sf/mw/web/browserutilities/multipartparser/group"/>
 </component>
 <component name="schemehandler" filter="s60" long-name="Scheme Handler">
 <unit bldFile="/sf/mw/web/browserutilities/schemehandler/group"/>
@@ -174,10 +167,6 @@
 <component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
 <unit bldFile="/sf/mw/web/browserutilities/aiwbrowserprovider/group"/>
 </component>
-<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="/sf/mw/web/browserutilities/group"/>
-</component>
 </collection>
 <collection name="webengine" long-name="Web Engine" level="server">
 <component name="osswebengine" filter="s60" long-name="OSS Web Engine">
@@ -258,29 +247,23 @@
 </component>
 </collection>
 <collection name="widgets" long-name="Web Widget Framework" level="generic">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y" class="placeholder">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
+<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
+<unit bldFile="/sf/mw/web/widgets/widgetrecognizer/group"/>
+</component>
+<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
+<unit bldFile="/sf/mw/web/widgets/widgetinstaller/group"/>
 </component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y" class="placeholder">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
+<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
+<unit bldFile="/sf/mw/web/widgets/widgetlauncher/group"/>
 </component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher" class="placeholder">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI" class="placeholder">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
+<component name="widgetapp" filter="s60" long-name="Widget UI">
+<unit bldFile="/sf/mw/web/widgets/widgetapp/group"/>
 </component>
 <component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
+<unit bldFile="/sf/mw/web/widgets/widgetpreinstaller/group"/>
 </component>
 <component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
-      		#included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="/sf/mw/web/widgets/group"/>
+<unit bldFile="/sf/mw/web/widgets/widgetstartup/group"/>
 </component>
 </collection>
 </block>