diff -r 52097e3efe51 -r af9a3c6582bb symbian4/os/ossrv/package_definition.xml
--- a/symbian4/os/ossrv/package_definition.xml	Thu Sep 09 10:32:56 2010 +0100
+++ b/symbian4/os/ossrv/package_definition.xml	Thu Sep 09 14:03:04 2010 +0100
@@ -50,175 +50,175 @@
   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="os" long-name="OS" levels="hw services">
-   <block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
+   <block name="ossrv" level="services" levels="physical-abstraction app-libs encoding translation data-services utilities" long-name="Generic OS Services">
 <collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-<component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
+<component name="boost_apis" long-name="Boost APIs" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/boost_apis/group"/>
 </component>
-<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
+<component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/cpp_wrappers/group"/>
 </component>
-<component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
+<component name="character_type_apis" long-name="Character Type APIs" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/character_type_apis/group"/>
 </component>
-<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
+<component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
 </component>
-<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
+<component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/configuration/group"/>
 </component>
-<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
+<component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
 </component>
-<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
+<component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
 </component>
-<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
+<component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
 </component>
-<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
+<component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
 </component>
-<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
+<component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
 </component>
-<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
+<component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
 </component>
-<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
+<component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
 </component>
-<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
+<component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
 </component>
-<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
+<component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/debug/group"/>
 </component>
-<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
+<component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/exceptions/group"/>
 </component>
-<component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
+<component name="io_stream_api" long-name="I/O stream API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/io_stream_api/group"/>
 </component>
-<component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
+<component name="localization_function_api" long-name="Localization Function API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/localization_function_api/group"/>
 </component>
-<component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
+<component name="math_operations_api" long-name="Math Operations API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/math_operations_api/group"/>
 </component>
-<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
+<component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/memory/group"/>
 </component>
-<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
+<component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/no_namespace_headers/group"/>
 </component>
-<component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
+<component name="openc_headers" long-name="OpenC headers" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/openc_headers/group"/>
 </component>
-<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
+<component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/openc_wrappers/group"/>
 </component>
-<component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
+<component name="ssl_general_api" long-name="SSL General API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/ssl_general_api/group"/>
 </component>
-<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
+<component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
 </component>
-<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
+<component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
 </component>
-<component name="stl" long-name="STL API" filter="s60" class="api">
+<component name="stl" long-name="STL API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/stl/group"/>
 </component>
-<component name="thread_api" long-name="Thread API" filter="s60" class="api">
+<component name="thread_api" long-name="Thread API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/thread_api/group"/>
 </component>
-<component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
+<component name="type_attributes" long-name="Type Attributes API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/type_attributes/group"/>
 </component>
-<component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
+<component name="typeinfo" long-name="Type Info API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/typeinfo/group"/>
 </component>
-<component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
+<component name="utility_apis" long-name="Utility APIs" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/utility_apis/group"/>
 </component>
-<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
+<component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/wide_character_classapis/group"/>
 </component>
-<component name="dbus_api" long-name="Dbus API" filter="s60" class="api">
+<component name="dbus_api" long-name="Dbus API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/dbus/group"/>
 </component>
-<component name="dbus-glib_api" long-name="D-Bus GLib API" filter="s60" class="api">
+<component name="dbus-glib_api" long-name="D-Bus GLib API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/dbus-glib/group"/>
 </component>
 </collection>
 <collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
-<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
+<component name="libutils_apis" long-name="Utility Library APIs" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_plat/libutils/group"/>
 </component>
 </collection>
 <collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" filter="s60" long-name="Z Compression Library">
+<component name="libz" long-name="Z Compression Library" filter="s60" purpose="optional">
 <unit bldFile="/sf/os/ossrv/stdlibs/libz/group"/>
 </component>
-<component name="libcrypt" filter="s60" long-name="Crypt Library">
+<component name="libcrypt" long-name="Crypt Library" filter="s60" purpose="optional">
 <unit bldFile="/sf/os/ossrv/stdlibs/libcrypt/group"/>
 </component>
 </collection>
 <collection name="ssl" long-name="SSL" level="data-services">
-<component name="libcrypto" filter="s60" long-name="Crypto Library">
+<component name="libcrypto" long-name="Crypto Library" filter="s60" purpose="optional">
 <unit bldFile="/sf/os/ossrv/ssl/libcrypto/group"/>
 </component>
-<component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
+<component name="libssl" long-name="SSL Library" filter="s60" purpose="development">
 <unit bldFile="/sf/os/ossrv/ssl/libssl/group"/>
 </component>
 </collection>
 <collection name="glib" long-name="GLib" level="utilities">
-<component name="glibbackend" filter="s60" long-name="GLib Backend">
+<component name="glibbackend" long-name="GLib Backend" filter="s60" purpose="optional">
 <unit bldFile="/sf/os/ossrv/glib/build/symbian/glibbackend/group"/>
 <!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
 </component>
-<component name="libglib" filter="s60" long-name="GLib Library">
+<component name="libglib" long-name="GLib Library" filter="s60" purpose="optional">
 <unit bldFile="/sf/os/ossrv/glib/build/symbian/glib/group"/>
 <!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
 </component>
-<component name="libgthread" filter="s60" long-name="Libg Thread">
+<component name="libgthread" long-name="Libg Thread" filter="s60" purpose="optional">
 <unit bldFile="/sf/os/ossrv/glib/build/symbian/gthread/group"/>
 <!-- Move to here:     <unit bldFile="glib/libgthread/group"/> -->
 </component>
-<component name="libgmodule" filter="s60" long-name="Libg Module">
+<component name="libgmodule" long-name="Libg Module" filter="s60" purpose="optional">
 <unit bldFile="/sf/os/ossrv/glib/build/symbian/gmodule/group"/>
 <!-- Move to here:         <unit bldFile="glib/libgmodule/group"/> -->
 </component>
-<component name="libgobject" filter="s60" long-name="Libg Object">
+<component name="libgobject" long-name="Libg Object" filter="s60" purpose="optional">
 <unit bldFile="/sf/os/ossrv/glib/build/symbian/gobject/group"/>
 <!-- Move to here:         <unit bldFile="glib/libgobject/group"/> -->
 </component>
 </collection>
 <collection name="stdcpp" long-name="C++ Standard Library" level="translation">
 <!-- collection is really a component. Needs to be moved down a directory -->
-<component name="stdcpp_build" filter="s60" long-name="Stdcpp">
+<component name="stdcpp_build" long-name="Stdcpp" filter="s60" purpose="optional">
 <unit bldFile="/sf/os/ossrv/stdcpp/group"/>
 </component>
 </collection>
 <collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
-<component name="dbus" filter="s60" long-name="D-Bus">
+<component name="dbus" long-name="D-Bus" filter="s60" purpose="optional">
 <unit bldFile="/sf/os/ossrv/ofdbus/dbus/group"/>
 </component>
-<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
+<component name="dbus-glib" long-name="D-Bus GLib" filter="s60" purpose="optional">
 <unit bldFile="/sf/os/ossrv/ofdbus/dbus-glib/group"/>
 </component>
-<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
+<component name="ofdbus_rom" long-name="D-Bus ROM" filter="s60" purpose="optional">
 <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
             Consider moving IBY file to one of the above as well and removing this component entirely -->
 <unit bldFile="/sf/os/ossrv/ofdbus/group"/>
 </component>
 </collection>
 <collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-<component name="libutils" filter="s60" long-name="Utility Library">
+<component name="libutils" long-name="Utility Library" filter="s60" purpose="optional">
 <unit bldFile="/sf/os/ossrv/utilitylibraries/libutils/group"/>
 </component>
 </collection>
@@ -280,7 +280,7 @@
 </component>
 </collection>
 <collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
+<component name="ossrv_build" long-name="Generic OS Services Build" filter="s60" purpose="optional">
 <!-- exports should be moved to individual components -->
 <unit bldFile="/sf/os/ossrv/group"/>
 </component>