--- a/symbian4/mw/websrv/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
+++ b/symbian4/mw/websrv/package_definition.xml	Tue Sep 07 16:33:09 2010 +0100
@@ -50,123 +50,123 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="websrv" level="generic" levels="plugin framework server generic specific" long-name="Web Services">
+   <block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
 <collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" purpose="optional" class="api">
+<component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
 <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_description_api/group"/>
 </component>
-<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" purpose="optional" class="api">
+<component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
 <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/group"/>
 </component>
-<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" purpose="optional" class="api">
+<component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
 <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_manager_api/group"/>
 </component>
-<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" purpose="optional" class="api">
+<component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
 <unit bldFile="/sf/mw/websrv/websrv_pub/hostlet_connection_api/group"/>
 </component>
-<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" purpose="optional" class="api">
+<component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
 <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_messaging_api/group"/>
 </component>
-<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" purpose="optional" class="api">
+<component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
 <unit bldFile="/sf/mw/websrv/websrv_pub/xml_extensions_api/group"/>
 </component>
-<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" purpose="optional" class="api">
+<component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
 <unit bldFile="/sf/mw/websrv/websrv_pub/xml_fragment_api/group"/>
 </component>
 </collection>
 <collection name="webservices" long-name="Web Services Framework" level="generic">
 <!-- consider breaking this collection into more meaningful subsets -->
-<component name="wsnotifierplugins" long-name="WS Notifier Plugins" filter="s60" purpose="optional" plugin="Y">
+<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
 <unit bldFile="/sf/mw/websrv/webservices/wsnotifierplugins/group"/>
 </component>
-<component name="wslogger" long-name="WS Logger" filter="s60" purpose="optional">
+<component name="wslogger" filter="s60" long-name="WS Logger">
 <unit bldFile="/sf/mw/websrv/webservices/wslogger/group"/>
 </component>
-<component name="wsxml" long-name="WS XML Extensions" filter="s60" purpose="optional">
+<component name="wsxml" filter="s60" long-name="WS XML Extensions">
 <unit bldFile="/sf/mw/websrv/webservices/wsxml/group"/>
 </component>
-<component name="wsutils" long-name="WS Utils" filter="s60" purpose="optional">
+<component name="wsutils" filter="s60" long-name="WS Utils">
 <unit bldFile="/sf/mw/websrv/webservices/wsutils/group"/>
 </component>
-<component name="wsfragment" long-name="WS Fragment" filter="s60" purpose="optional">
+<component name="wsfragment" filter="s60" long-name="WS Fragment">
 <unit bldFile="/sf/mw/websrv/webservices/wsfragment/group"/>
 </component>
-<component name="wsdescription" long-name="WS Service Description" filter="s60" purpose="optional">
+<component name="wsdescription" filter="s60" long-name="WS Service Description">
 <unit bldFile="/sf/mw/websrv/webservices/wsdescription/group"/>
 </component>
-<component name="wsconnection" long-name="WS Service Connection" filter="s60" purpose="optional">
+<component name="wsconnection" filter="s60" long-name="WS Service Connection">
 <unit bldFile="/sf/mw/websrv/webservices/wsconnection/group"/>
 </component>
-<component name="wsmessages" long-name="WS Messages" filter="s60" purpose="optional">
+<component name="wsmessages" filter="s60" long-name="WS Messages">
 <unit bldFile="/sf/mw/websrv/webservices/wsmessages/group"/>
 </component>
-<component name="wscredentialmanager" long-name="WS Credential Manager" filter="s60" purpose="optional">
+<component name="wscredentialmanager" filter="s60" long-name="WS Credential Manager">
 <unit bldFile="/sf/mw/websrv/webservices/wscredentialmanager/group"/>
 </component>
-<component name="wsframework" long-name="WS Framework" filter="s60" purpose="optional">
+<component name="wsframework" filter="s60" long-name="WS Framework">
 <unit bldFile="/sf/mw/websrv/webservices/wsframework/group"/>
 </component>
-<component name="wshttpchanneltransportplugin" long-name="WS HTTP Channel Transport Plugin" filter="s60" purpose="optional" plugin="Y">
+<component name="wshttpchanneltransportplugin" filter="s60" long-name="WS HTTP Channel Transport Plugin" plugin="Y">
 <unit bldFile="/sf/mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
 </component>
-<component name="wsconnectionagent" long-name="WS Connection Agent" filter="s60" purpose="optional">
+<component name="wsconnectionagent" filter="s60" long-name="WS Connection Agent">
 <unit bldFile="/sf/mw/websrv/webservices/wsconnectionagent/group"/>
 </component>
-<component name="wsprovider" long-name="WS Provider" filter="s60" purpose="optional">
+<component name="wsprovider" filter="s60" long-name="WS Provider">
 <unit bldFile="/sf/mw/websrv/webservices/wsprovider/group"/>
 </component>
-<component name="wshostletconnection" long-name="WS Hostlet Connection" filter="s60" purpose="optional">
+<component name="wshostletconnection" filter="s60" long-name="WS Hostlet Connection">
 <unit bldFile="/sf/mw/websrv/webservices/wshostletconnection/group"/>
 </component>
-<component name="wsmanager" long-name="WS Service Manager" filter="s60" purpose="optional">
+<component name="wsmanager" filter="s60" long-name="WS Service Manager">
 <unit bldFile="/sf/mw/websrv/webservices/wsmanager/group"/>
 </component>
-<component name="wsidentitymanager" long-name="WS Identity Manager" filter="s60" purpose="optional">
+<component name="wsidentitymanager" filter="s60" long-name="WS Identity Manager">
 <unit bldFile="/sf/mw/websrv/webservices/wsidentitymanager/group"/>
 </component>
-<component name="idwsfplugin" long-name="ID-WSF Plugin" filter="s60" purpose="optional" plugin="Y">
+<component name="idwsfplugin" filter="s60" long-name="ID-WSF Plugin" plugin="Y">
 <unit bldFile="/sf/mw/websrv/webservices/idwsfplugin/group"/>
 </component>
-<component name="wsibasicplugin" long-name="WS-I Basic Plugin" filter="s60" purpose="optional" plugin="Y">
+<component name="wsibasicplugin" filter="s60" long-name="WS-I Basic Plugin" plugin="Y">
 <unit bldFile="/sf/mw/websrv/webservices/wsibasicplugin/group"/>
 </component>
-<component name="wsrestplugin" long-name="WS REST Plugin" filter="s60" purpose="optional" plugin="Y">
+<component name="wsrestplugin" filter="s60" long-name="WS REST Plugin" plugin="Y">
 <unit bldFile="/sf/mw/websrv/webservices/wsrestplugin/group"/>
 </component>
-<component name="idwsfsecuritymechanism" long-name="ID-WSF Security Mechanism" filter="s60" purpose="optional">
+<component name="idwsfsecuritymechanism" filter="s60" long-name="ID-WSF Security Mechanism">
 <unit bldFile="/sf/mw/websrv/webservices/idwsfsecuritymechanism/group"/>
 </component>
-<component name="wspasswordtransforms" long-name="WS Password Transforms" filter="s60" purpose="optional">
+<component name="wspasswordtransforms" filter="s60" long-name="WS Password Transforms">
 <unit bldFile="/sf/mw/websrv/webservices/wspasswordtransforms/group"/>
 </component>
-<component name="wscore" long-name="WS Core Service Manager" filter="s60" purpose="optional">
+<component name="wscore" filter="s60" long-name="WS Core Service Manager">
 <unit bldFile="/sf/mw/websrv/webservices/wscore/group"/>
 </component>
-<component name="wslocaltransportplugin" long-name="WS Local Transport Plugin" filter="s60" purpose="optional" plugin="Y">
+<component name="wslocaltransportplugin" filter="s60" long-name="WS Local Transport Plugin" plugin="Y">
 <unit bldFile="/sf/mw/websrv/webservices/wslocaltransportplugin/group"/>
 </component>
-<component name="wshostlettransportplugin" long-name="WS Hostlet Transport Plugin" filter="s60" purpose="optional" plugin="Y">
+<component name="wshostlettransportplugin" filter="s60" long-name="WS Hostlet Transport Plugin" plugin="Y">
 <unit bldFile="/sf/mw/websrv/webservices/wshostlettransportplugin/group"/>
 </component>
-<component name="wsstar" long-name="WS Star" filter="s60" purpose="optional">
+<component name="wsstar" filter="s60" long-name="WS Star">
 <!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
 <unit bldFile="/sf/mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
 <unit bldFile="/sf/mw/websrv/webservices/wsstar/wsstarplugin/group"/>
 <unit bldFile="/sf/mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
 </component>
-<component name="wsoviplugin" long-name="WS Ovi Plugin" filter="s60" purpose="optional">
+<component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
 <unit bldFile="/sf/mw/websrv/webservices/wsoviplugin/group"/>
 </component>
-<component name="webservices_build" long-name="Web Services Build" filter="s60" purpose="optional">
+<component name="webservices_build" filter="s60" long-name="Web Services Build">
 <!-- need to split into self-contained components -->
 <unit bldFile="/sf/mw/websrv/webservices/group"/>
 </component>
 </collection>
 <collection name="websrv_info" long-name="Web Services Info" level="specific">
-<component name="websrv_bld" long-name="Web Services Build" filter="s60" purpose="optional">
+<component name="websrv_bld" filter="s60" long-name="Web Services Build">
 <!-- need to include common .hrh in each unit -->
 <unit bldFile="/sf/mw/websrv/group"/>
 </component>