--- a/symbian3/mw/remotestorage/package_definition.xml	Tue May 25 11:17:36 2010 +0100
+++ b/symbian3/mw/remotestorage/package_definition.xml	Wed May 26 17:18:20 2010 +0100
@@ -1,121 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!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 >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!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
->
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
-        <collection name="rsfw_plat" long-name="Remote Storage Platform Interfaces" level="if">
-          <component name="rsfw_access_protocol_plugin_api" filter="s60" long-name="Remote Storage Framework Access Protocol Plugin API" class="api">
-            <unit bldFile="/sf/mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
-          </component>
-        </collection>
-        <collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
-          <component name="mountstore" filter="s60" long-name="RSFW Mount Store">
-            <unit bldFile="/sf/mw/remotestorage/remotestoragefw/mountstore/group"/>
-          </component>
-          <component name="rsfwnotifierplugins" filter="s60" long-name="RSFW Notifier Plugins" plugin="Y">
-            <unit bldFile="/sf/mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
-          </component>
-          <component name="remotefileengine" filter="s60" long-name="Remote File Engine">
-            <unit bldFile="/sf/mw/remotestorage/remotestoragefw/remotefileengine/group"/>
-          </component>
-          <component name="mountmanager" filter="s60" long-name="RSFW Mount Manager">
-            <unit bldFile="/sf/mw/remotestorage/remotestoragefw/mountmanager/group"/>
-          </component>
-          <component name="webdavaccessplugin" filter="s60" long-name="WebDAV Access Plugin" plugin="Y">
-            <unit bldFile="/sf/mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
-          </component>
-          <component name="remotefilesystemplugin" filter="s60" long-name="Remote Filesystem Plugin" plugin="Y">
-            <unit bldFile="/sf/mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
-          </component>
-          <component name="remotestoragegsplugin" filter="s60" long-name="RS GS Plugin" plugin="Y">
-            <!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-            <!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
-          </component>
-          <component name="remotedriveconfigurationbiocontrol" filter="s60" long-name="Remote Drive Configuration BIO Control">
-            <!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-            <!--   <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
-          </component>
-          <component name="remotestoragefw_build" filter="s60" long-name="Remote Storage Framework Build">
-            <!-- move exports to other components.
+<SystemDefinition schema="3.0.0">
+ <package id="remotestorage" name="Remote Storage" levels="framework if">
+  <collection id="rsfw_plat" name="Remote Storage Platform Interfaces" level="if">
+      <component id="rsfw_access_protocol_plugin_api" filter="s60" class="api" name="Remote Storage Framework Access Protocol Plugin API">
+	    <meta rel="Api" href="rsfw_plat/rsfw_access_protocol_plugin_api/remote_storage_fw_mountman_api.metaxml"/>
+        <unit bldFile="rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
+      </component>
+  </collection>
+  <collection id="remotestoragefw" name="Remote Storage Framework" level="framework">
+   <component id="mountstore" filter="s60" name="RSFW Mount Store">
+    <unit bldFile="remotestoragefw/mountstore/group"/>
+   </component>
+   <component id="rsfwnotifierplugins" filter="s60" name="RSFW Notifier Plugins" class="plugin">
+    <unit bldFile="remotestoragefw/rsfwnotifierplugins/group"/>
+   </component>
+   <component id="remotefileengine" filter="s60" name="Remote File Engine">
+    <unit bldFile="remotestoragefw/remotefileengine/group"/>
+   </component>
+   <component id="mountmanager" filter="s60" name="RSFW Mount Manager">
+    <unit bldFile="remotestoragefw/mountmanager/group"/>
+   </component>
+   <component id="webdavaccessplugin" filter="s60" name="WebDAV Access Plugin" class="plugin">
+    <unit bldFile="remotestoragefw/webdavaccessplugin/group"/>
+   </component>
+   <component id="remotefilesystemplugin" filter="s60" name="Remote Filesystem Plugin" class="plugin">
+    <unit bldFile="remotestoragefw/remotefilesystemplugin/group"/>
+   </component>
+   <component id="remotestoragegsplugin" filter="s60" name="RS GS Plugin" class="plugin">
+    <meta rel="config">
+     <defined condition="__REMOTE_STORAGE_FW"/>
+    </meta>
+    <!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
+    <!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
+   </component>
+   <component id="remotedriveconfigurationbiocontrol" filter="s60" name="Remote Drive Configuration BIO Control">
+    <meta rel="config">
+     <defined condition="__REMOTE_STORAGE_FW"/>
+    </meta>
+    <!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
+    <!--   <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
+   </component>
+   <component id="remotestoragefw_build" filter="s60" name="Remote Storage Framework Build">
+    <!-- move exports to other components.
 				This is needed for #includes of configured component until congigiration is in place -->
-            <unit bldFile="/sf/mw/remotestorage/remotestoragefw/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+    <unit bldFile="remotestoragefw/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>