--- a/symbian3/mw/inputmethods/package_definition.xml	Fri Jan 29 16:25:53 2010 +0000
+++ b/symbian3/mw/inputmethods/package_definition.xml	Mon Feb 01 16:11:43 2010 +0000
@@ -1,119 +1,157 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!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="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework">
-<collection name="fep" long-name="FEP" level="engine">
-<component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
-<unit bldFile="/sf/mw/inputmethods/fep/frontendprocessor/group" mrp="/sf/mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-</component>
-</collection>
-<collection name="inputmethods_info" long-name="Input Methods Info" level="framework">
-<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="inputmethods">
-<unit bldFile="/sf/mw/inputmethods/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!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="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework">
+        <collection name="textinput" long-name="Text Input" level="framework">
+          <component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
+            <!--uncomment when configuration is turned on and textinput_build is removed-->
+            <!--  <unit bldFile="textinput/ptienginev2/group"/>-->
+          </component>
+          <component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
+            <unit bldFile="/sf/mw/inputmethods/textinput/akninputlanguage/group"/>
+          </component>
+          <component name="peninputarc" filter="s60" long-name="Pen Input Arc">
+            <unit bldFile="/sf/mw/inputmethods/textinput/peninputarc/group"/>
+          </component>
+          <component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
+            <unit bldFile="/sf/mw/inputmethods/textinput/peninputcommonctrls/group"/>
+          </component>
+          <component name="peninputhwrboxcn" filter="s60" long-name="Chinese Handwriting Recognition Box" plugin="Y">
+            <unit bldFile="/sf/mw/inputmethods/textinput/peninputhwrboxcn/group"/>
+          </component>
+          <component name="peninputvkbcn" filter="s60" long-name="Chinese Virtual Keyboard" plugin="Y">
+            <unit bldFile="/sf/mw/inputmethods/textinput/peninputvkbcn/group"/>
+          </component>
+          <component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
+            <unit bldFile="/sf/mw/inputmethods/textinput/peninputcommonlayout/group"/>
+          </component>
+          <component name="peninputgenerichwr" filter="s60" long-name="Pen Input Generic Handwriting Recognition" plugin="Y">
+            <unit bldFile="/sf/mw/inputmethods/textinput/peninputgenerichwr/group"/>
+          </component>
+          <component name="peninputgenericvkb" filter="s60" long-name="Pen Input Generic Virtual Keyboard" plugin="Y">
+            <unit bldFile="/sf/mw/inputmethods/textinput/peninputgenericvkb/group"/>
+          </component>
+          <component name="peninputcommonctrlsjp" filter="s60" long-name="Pen Input Common Controls Japanese">
+            <unit bldFile="/sf/mw/inputmethods/textinput/peninputcommonctrlsjp/group"/>
+          </component>
+          <component name="peninputhwrboxjp" filter="s60" long-name="Japanese Handwriting Recognition Box" plugin="Y">
+            <unit bldFile="/sf/mw/inputmethods/textinput/peninputhwrboxjp/group"/>
+          </component>
+          <component name="peninputvkbjp" filter="s60" long-name="Japanese Virtual Keyboard" plugin="Y">
+            <unit bldFile="/sf/mw/inputmethods/textinput/peninputvkbjp/group"/>
+          </component>
+          <component name="gslangplugin" filter="s60" long-name="GS Language Plugin" plugin="Y">
+            <unit bldFile="/sf/mw/inputmethods/textinput/gslangplugin"/>
+          </component>
+          <component name="textinput_build" filter="s60" long-name="Text Input Build">
+            <!--needed for #ifdef, can be removed when configuration is implemented -->
+            <unit bldFile="/sf/mw/inputmethods/textinput/group"/>
+          </component>
+        </collection>
+        <collection name="fep" long-name="FEP" level="engine">
+          <component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
+            <unit bldFile="/sf/mw/inputmethods/fep/aknfep/group"/>
+          </component>
+          <component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
+            <unit bldFile="/sf/mw/inputmethods/fep/frontendprocessor/group" mrp="/sf/mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
+          </component>
+        </collection>
+        <collection name="inputmethods_info" long-name="Input Methods Info" level="framework">
+          <component name="inputmethods_plat" filter="s60" long-name="Input Methods Platform Interfaces" class="api">
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/group"/>
+          </component>
+          <component name="inputmethods_pub" filter="s60" long-name="Input Methods Public Interfaces" class="api">
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/group"/>
+          </component>
+          <component name="inputmethods_test" filter="s60,api_test" long-name="Input Methods Tests" introduced="^2" purpose="development">
+            <!-- can only have one unit, #include from a single bld.inf -->
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group"/>
+          </component>
+          <component name="inputmethods_api_tests" filter="s60,api_test" long-name="Input Methods API Tests" introduced="^2" purpose="development">
+            <unit bldFile="/sf/mw/inputmethods/tsrc/group"/>
+          </component>
+          <component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
+            <unit mrp="/sf/mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>