--- a/symbian3/mw/dlnasrv/package_definition.xml	Wed Dec 02 18:06:06 2009 +0000
+++ b/symbian3/mw/dlnasrv/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
@@ -1,210 +1,139 @@
 <?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="dlnasrv" long-name="DLNA Services" tech_domain="de" level="specific" levels="framework server plugin">
-    <collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-     <component name="avcontrolframework" long-name="A/V Control Famework" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-     </component>
-     <component name="avcpengine" long-name="AVCP Engine" origin-model="foundation"/>
-     <component name="avcpengineclient" long-name="Avcp Engine Client" origin-model="foundation"/>
-     <component name="upnpaccessplugin" long-name="UPnP Access Plugin" origin-model="foundation"/>
-     <component unofficial="yes" name="upnpavcontrolpoint_build" long-name="UPnP A/V Control Point Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpavcontrolpoint/group"/>
-     </component>
-    </collection>
-    <collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-     <component name="avobjects" long-name="A/V Objects" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-     </component>
-     <component name="mediaserverclient" long-name="Media Server Client" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-     </component>
-     <component name="connectionmanagerservice" long-name="Connection Manager Service" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-     </component>
-     <component name="contentdirectoryservice" long-name="Content Directory Service" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-     </component>
-     <component name="mediaserverengine" long-name="Media Server Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-     </component>
-     <component unofficial="yes" name="upnpmediaserver_build" long-name="UPnP Media Server Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/group"/>
-     </component>
-    </collection>
-    <collection name="upnpstack" long-name="UPnP Stack" level="framework">
-     <component name="upnputils" long-name="UPnP Utils" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpstack/upnputils/group"/>
-     </component>
-     <component name="upnpconnectionmanagersession" long-name="UPnP Connection Manager Session" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpstack/upnpconnectionmanagersession/group"/>
-     </component>
-     <component name="upnpconnmanager" long-name="UPnP Connection Manager" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpstack/upnpconnmanager/group"/>
-     </component>
-     <component name="dlnawebserver" long-name="DLNA Web Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpstack/dlnawebserver/group"/>
-     </component>
-     <component name="serviceframework" long-name="Service Framework" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpstack/serviceframework/group"/>
-     </component>
-     <component name="ssdpserver" long-name="SSDP Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpstack/ssdpserver/group"/>
-     </component>
-     <component name="messagehandler" long-name="Message Handler" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpstack/messagehandler/group"/>
-     </component>
-     <component name="controlpointbase" long-name="Control Point Base" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpstack/controlpointbase/group"/>
-     </component>
-     <component name="upnphttptransfer" long-name="UPnP HTTP Transfer" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpstack/upnphttptransfer/group"/>
-     </component>
-     <component unofficial="yes" name="upnpstack_build" long-name="UPnP Stack Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpstack/group"/>
-     </component>
-    </collection>
-    <collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-     <component name="upnpdlnaprofiler" long-name="UPnP DLNA Profiler" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-     </component>
-     <component name="upnpsecurity" long-name="UPnP Security" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-     </component>
-     <component name="upnpcontentserver" long-name="UPnP Content Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-     </component>
-     <component name="applicationengine" long-name="Application Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpsharing/applicationengine/group"/>
-     </component>
-     <component unofficial="yes" name="upnpsharing_build" long-name="UPnP Sharing Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpsharing/group"/>
-     </component>
-    </collection>
-    <collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-     <component name="upnpsettingsengine" long-name="UPnP Settings Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-     </component>
-     <component name="multiselectionui" long-name="Multi-Selection UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpsettings/multiselectionui/group"/>
-     </component>
-     <component name="appwizard" long-name="App Wizard" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpsettings/appwizard/group"/>
-     </component>
-     <component name="upnpsharingui" long-name="UPnP Sharing UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpsettings/upnpsharingui/group"/>
-     </component>
-     <component name="upnpgsplugin" long-name="UPnP GS Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-     </component>
-     <component unofficial="yes" name="upnpsettings_build" long-name="UPnP Settings Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpsettings/group"/>
-     </component>
-    </collection>
-    <collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-     <component name="upnpplaybackplugins" long-name="UPnP Playback Plugins" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-     </component>
-     <component unofficial="yes" name="upnpmpxplugins_build" long-name="UPnP MPX Plugins Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpmpxplugins/group"/>
-     </component>
-    </collection>
-    <collection name="upnpharvester" long-name="UPnP Harvester" level="server">
-     <component name="upnpharvester_common" long-name="Common" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpharvester/common/cmlibrary/group"/>
-      <unit bldFile="/sf/mw/dlnasrv/upnpharvester/common/cmsettings/group"/>
-      <unit bldFile="/sf/mw/dlnasrv/upnpharvester/common/cmsqlwrapper/group"/>
-      <unit bldFile="/sf/mw/dlnasrv/upnpharvester/common/dbmanager/group"/>
-     </component>
-     <component name="cdssync" long-name="CDS Sync" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpharvester/cdssync/common"/>
-     </component>
-     <component name="mdhserver" long-name="MDH Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpharvester/mdhserver/group"/>
-     </component>
-     <component unofficial="yes" name="upnpharvester_build" long-name="UPnP Harvester Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpharvester/group"/>
-     </component>
-    </collection>
-    <collection name="upnpframework" long-name="UPnP Framework" level="framework">
-     <component name="upnputilities" long-name="UPnP Utilities" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnputilities/group"/>
-     </component>
-     <component name="upnpextensionpluginif" long-name="UPnP Extension Plugin IF" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpextensionpluginif/group"/>
-     </component>
-     <component name="upnpfiletransferengine" long-name="UPnP File Transfer Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpfiletransferengine/group"/>
-     </component>
-     <component name="upnpmusicadapter" long-name="UPnP Musicadapter" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-     </component>
-     <component name="upnpcommonui" long-name="UPnP Common UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpcommonui/group"/>
-     </component>
-     <component name="upnpcommand" long-name="UPnP Command" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpcommand/group"/>
-     </component>
-     <component name="upnpaiwengine" long-name="UPnP AIW Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpaiwengine/group"/>
-     </component>
-     <component name="upnpaiwprovider" long-name="UPnP AIW Provider" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpaiwprovider/group"/>
-     </component>
-     <component unofficial="yes" name="upnpframework_build" long-name="UPnP Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpframework/group"/>
-     </component>
-    </collection>
-    <collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="server">
-     <component name="upnpxmlparser" long-name="UPnP XML Parser" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-     </component>
-     <component name="upnpavcontrollerserver" long-name="UPnP A/V Controller Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-     </component>
-     <component name="upnpavcontrollerclient" long-name="UPnP A/V Ccontroller Client" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-     </component>
-     <component name="upnpavcontrollerhelper" long-name="UPnP A/V Controller Helper" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-     </component>
-     <component unofficial="yes" name="upnpavcontroller_build" long-name="UPnP A/V Controller Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpavcontroller/group"/>
-     </component>
-    </collection>
-    <collection name="homesync" long-name="Home Sync" level="plugin">
-     <component name="contentmanager" long-name="Content Manager" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/homesync/contentmanager/cmserver/cmfillmanager/group"/>
-      <unit bldFile="/sf/mw/dlnasrv/homesync/contentmanager/cmserver/cmmemorymanager/group"/>
-      <unit bldFile="/sf/mw/dlnasrv/homesync/contentmanager/cmserver/cmscheduler/group"/>
-      <unit bldFile="/sf/mw/dlnasrv/homesync/contentmanager/cmserver/cmserver/group"/>
-      <unit bldFile="/sf/mw/dlnasrv/homesync/contentmanager/cmserver/cmstoremanager/group"/>
-      <unit bldFile="/sf/mw/dlnasrv/homesync/contentmanager/homesyncgsplugin/group"/>
-      <unit bldFile="/sf/mw/dlnasrv/homesync/contentmanager/homesyncwizard/group"/>
-      <unit bldFile="/sf/mw/dlnasrv/homesync/contentmanager/mediaservant/applicationengine/group"/>
-      <unit bldFile="/sf/mw/dlnasrv/homesync/contentmanager/mediaservant/group"/>
-     </component>
-     <component unofficial="yes" name="homesync_build" long-name="Home Sync Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/homesync/group"/>
-     </component>
-    </collection>
-    <collection name="homemedia" long-name="Home Media" level="framework">
-     <component name="homemedia_build" long-name="Home Media" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/homemedia/group"/>
-     </component>
-     
-    </collection>
-    <collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-     <component unofficial="yes" name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/dlnasrv_plat/group"/>
-     </component>
-     <component unofficial="yes" name="dlnasrv_build" long-name="DLNA Services Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/group"/>
-     </component>
-    </collection>
-   </block>
+<layer name="mw">
+<block name="dlnasrv">
+<collection name="s60">
+<component name="homemedia">
+<unit bldFile="/sf/mw/dlnasrv/homemedia/group" mrp=""/>
+</component>
+<component name="homesync">
+<unit bldFile="/sf/mw/dlnasrv/homesync/group" mrp=""/>
+</component>
+<component name="upnpavcontrolpoint">
+<unit bldFile="/sf/mw/dlnasrv/upnpavcontrolpoint/group" mrp=""/>
+</component>
+<component name="upnpframework">
+<unit bldFile="/sf/mw/dlnasrv/upnpframework/group" mrp=""/>
+</component>
+<component name="upnpharvester">
+<unit bldFile="/sf/mw/dlnasrv/upnpharvester/group" mrp=""/>
+</component>
+<component name="upnpmediaserver">
+<unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/group" mrp=""/>
+</component>
+<component name="upnpavcontroller">
+<unit bldFile="/sf/mw/dlnasrv/upnpavcontroller/group" mrp=""/>
+</component>
+<component name="upnpsharing">
+<unit bldFile="/sf/mw/dlnasrv/upnpsharing/group" mrp=""/>
+</component>
+<component name="upnpsettings">
+<unit bldFile="/sf/mw/dlnasrv/upnpsettings/group" mrp=""/>
+</component>
+<component name="upnpmpxplugins">
+<unit bldFile="/sf/mw/dlnasrv/upnpmpxplugins/group" mrp=""/>
+</component>
+<component name="dlnasrv_plat">
+<unit bldFile="/sf/mw/dlnasrv/dlnasrv_plat/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
-</SystemDefinition>
\ No newline at end of file
+</SystemDefinition>