--- a/symbian3/mw/shortlinkconn/package_definition.xml	Mon Mar 15 18:29:08 2010 +0000
+++ b/symbian3/mw/shortlinkconn/package_definition.xml	Mon Mar 15 18:47:03 2010 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
+ <!ELEMENT SystemDefinition (systemModel)>
  <!ATTLIST SystemDefinition
   name CDATA #REQUIRED
   schema CDATA #REQUIRED>
@@ -49,61 +49,53 @@
   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">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
 <systemModel>
-<layer name="mw">
-<block name="shortlinkconn">
-<collection name="s60">
-<component name="shortlinkconn">
-<unit bldFile="/sf/mw/shortlinkconn/group" mrp=""/>
-</component>
-</collection>
-</block>
+<layer name="mw" long-name="Middleware" levels="generic specific">
+<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
+    <!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
+    <collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
+     <component name="locod" long-name="Local Connectivity Daemon">
+      <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/locod/group"/>
+     </component>
+     <component name="obexserviceman" long-name="OBEX Service Managar">
+      <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
+     </component>
+     <component name="obexsendservices" long-name="OBEX Send Services">
+      <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
+     </component>
+     <component name="obexreceiveservices" long-name="OBEX Receive Services">
+      <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
+     </component>
+     <component name="dun" long-name="Dial Up Networking">
+      <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/dun/group"/>
+     </component>
+     <component name="lccustomplugin" long-name="LC Custom Plugins" plugin="Y">
+      <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/lccustomplugin/group"/>
+     </component>
+     <component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
+      <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
+     </component>
+     <component name="legacymodemplugin" long-name="Legacy Modem Plugin" plugin="Y">
+      <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/legacymodemplugin/group"/>
+     </component>
+     <component name="modematplugin" long-name="Modem AT Plugin" plugin="Y">
+      <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/modematplugin/group"/>
+     </component>
+     <component name="generichid" long-name="Generic HID">
+      <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/generichid/group"/>
+     </component>
+     <component name="headset" long-name="Headset">
+      <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/headset/group"/>
+     </component>
+    </collection>
+    <collection name="shortlinkconn_info" long-name="Shortlink Connectivity Info" level="plugin">
+     <component name="shortlinkconn_plat" filter="s60" long-name="Shortlink Connectivity Platform Interfaces" class="api">
+      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/group"/>
+     </component>
+    </collection>
+   </block>
 </layer>
 </systemModel>
-</SystemDefinition>
+</SystemDefinition>
\ No newline at end of file