--- a/symbian3/mw/imsrv/package_definition.xml	Wed Dec 02 18:06:06 2009 +0000
+++ b/symbian3/mw/imsrv/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
@@ -1,112 +1,109 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (block*|collection*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT block (subblock*|collection*)*>
+ <!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT subblock (collection)*>
+ <!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT collection (component)*>
+ <!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED>
+ <!ELEMENT component (unit)*>
+ <!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) 'N'
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose (optional|mandatory|development) 'optional'>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED>
+ <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
+ <!ATTLIST SystemBuild schema CDATA #REQUIRED>
+ <!ELEMENT list (ref+)>
+ <!ATTLIST list
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT ref EMPTY>
+ <!ATTLIST ref item CDATA #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+  name ID #REQUIRED
+  abldTarget CDATA #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+  name ID #REQUIRED
+  abldOption CDATA #REQUIRED
+  description CDATA #REQUIRED
+  enable (Y|N) #REQUIRED>
+ <!ELEMENT configuration (listRef+|ref+|task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
+ <!ELEMENT listRef EMPTY>
+ <!ATTLIST listRef list CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y|N) #REQUIRED
+  targetParallel (Y|N) 'N'>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  root CDATA #IMPLIED
+  command CDATA #REQUIRED>
+]>
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="imsrv" long-name="Instant Messaging and Presence Services" tech_domain="pr" level="specific" levels="plugin framework server generic specific">
-    <collection name="imservices" long-name="IM Services" level="generic">
-     <component name="imfeatureplugin" long-name="IM Feature Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/imsrv/imservices/imfeatureplugin/group"/>
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/imfeatureplugin/srcimdatamodel/group"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/imfeatureplugin/srcimfrontend/group"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/imfeatureplugin/srcimoperations/group"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/imfeatureplugin/srcimprocessor/group"/> -->
-     </component>
-     <component name="searchfeatureplugin" long-name="Search Feature Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/imsrv/imservices/searchfeatureplugin/group"/>
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/searchfeatureplugin/srcsearchdatamodel/group"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/searchfeatureplugin/srcsearchfrontend/group"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/searchfeatureplugin/srcsearchoperations/group"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/searchfeatureplugin/srcsearchprocessor/group"/> -->
-     </component>
-     <component name="xmppsettingsapi" long-name="XMPP Setting Sapi" origin-model="foundation">
-      <unit bldFile="/sf/mw/imsrv/imservices/xmppsettingsapi/group"/>
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/xmppsettingsapi/tsrc/group"/> -->
-     </component>
-     <component name="xmppsettingsfetcher" long-name="XMPP Settingsfetcher" origin-model="foundation">
-      <unit bldFile="/sf/mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/xmppsettingsfetcher/tsrc/xmppsettingsfetchermt/group"/> -->
-     </component>
-     <component name="ossprotocoladaptation" long-name="OSS Protocol Adaptation" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/ossprotocoladaptation/dataconvlib/group"/> -->
-      <unit bldFile="/sf/mw/imsrv/imservices/ossprotocoladaptation/group"/>
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/ossprotocoladaptation/tsrc/ossadapmt/group"/> -->
-     </component>
-     <component name="instantmessagingcache" long-name="Instant Messaging Cache" origin-model="foundation">
-      <unit bldFile="/sf/mw/imsrv/imservices/instantmessagingcache/group"/>
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/instantmessagingcache/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="imservices_build" long-name="IM Services Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/imsrv/imservices/group"/>
-     </component>
-    </collection>
-    <collection name="ximpfw" long-name="XIMP Framework" level="framework">
-     <component name="ximpfw_core" long-name="Core" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/core/group"/> -->
-     </component>
-     <component name="presence" long-name="Presence" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/presence/group"/> -->
-     </component>
-     <component unofficial="yes" name="ximpfw_test" long-name="XIMP Framework Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presencewatching"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presencegroupmembermngt"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presenceblocking"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/tsrcutils"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_rootservices"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presenceall"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presencegrouplistmngt"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presencecache"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presencepublishing"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presencewatcherlistmngt"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/tsrcprotocols"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presencegrantrequestmngt"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_sessionmng"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presenceauthorization"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_eunittemplate"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_utils"/> -->
-     </component>
-     <component unofficial="yes" name="ximpfw_build" long-name="XIMP Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/imsrv/ximpfw/group"/>
-     </component>
-    </collection>
-    <collection name="brandingserver" long-name="Branding Server" level="specific">
-     <component name="tools" long-name="Tools" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/imsrv/brandingserver/tools/bsimport/group"/> -->
-     </component>
-     <component unofficial="yes" name="brandingserver_build" long-name="Branding Server Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/imsrv/brandingserver/group"/>
-     </component>
-    </collection>
-    <collection name="imsrv_info" long-name="Instant Messaging and Presence Services Info" level="specific">
-     <component unofficial="yes" name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/imsrv/imsrv_plat/group"/>
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/im_cache_client_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_eunittemplate"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencecache"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/xmpp_settings_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="imsrv_build" long-name="Instant Messaging and Presence Services Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/imsrv/group"/>
-     </component>
-    </collection>
-   </block>
+<layer name="mw">
+<block name="imsrv">
+<collection name="s60">
+<component name="imsrv">
+<unit bldFile="/sf/mw/imsrv/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
-</SystemDefinition>
\ No newline at end of file
+</SystemDefinition>