# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1264775706 0
# Node ID 82a6c2dffce11b530d1282f46b0a4a89eabbc82f
# Parent  af857589b11a83bec63dde95e437097674b7d1de
Add back in imgeditor / video editor. Include missing jrt package.

diff -r af857589b11a -r 82a6c2dffce1 symbian3/app/imgeditor/package_definition.xml
--- a/symbian3/app/imgeditor/package_definition.xml	Fri Jan 29 11:54:00 2010 +0000
+++ b/symbian3/app/imgeditor/package_definition.xml	Fri Jan 29 14:35:06 2010 +0000
@@ -1,103 +1,179 @@
 <?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="app" long-name="Applications" levels="services apps">
-<block name="imgeditor" level="apps" long-name="Image Editor Apps"/>
-</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="app" long-name="Applications" levels="services apps">
+      <block name="imgeditor" level="apps" long-name="Image Editor Apps" levels="engine ui">
+        <collection name="imageeditor" long-name="Image Editor UI" level="ui">
+          <component name="pb" filter="s60" long-name="Plugin Base">
+            <unit bldFile="/sf/app/imgeditor/imageeditor/pb/group"/>
+          </component>
+          <component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
+            <unit bldFile="/sf/app/imgeditor/imageeditor/iepb/group"/>
+          </component>
+          <component name="imageeditorui" filter="s60" long-name="Image Editor UI">
+            <unit bldFile="/sf/app/imgeditor/imageeditor/imageeditorui/group"/>
+          </component>
+          <component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
+            <unit bldFile="/sf/app/imgeditor/imageeditor/imageeditormanager/group"/>
+          </component>
+          <component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
+            <unit bldFile="/sf/app/imgeditor/imageeditor/imageeditorapp/group"/>
+          </component>
+          <component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
+            <!-- can only have one unit. Need to include all from a single bld.inf -->
+            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/cropplugin/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/drawplugin/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/frameplugin/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/textplugin/group"/>
+            <!-- conditionally #included in imageeditor_build: need to fix
+        <unit bldFile="imageeditor/plugins/drawplugin/group"/>
+         -->
+          </component>
+          <component name="editorprovider" filter="s60" long-name="Image Editor Provider">
+            <unit bldFile="/sf/app/imgeditor/imageeditor/editorprovider/group"/>
+          </component>
+          <component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
+            <!-- should distribute this to the other components -->
+            <unit bldFile="/sf/app/imgeditor/imageeditor/group"/>
+          </component>
+        </collection>
+        <collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
+          <component name="filters" filter="s60" long-name="Image Editor Filters">
+            <!-- can only have one unit. Need to include all from a single bld.inf -->
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterframe/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filternegate/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterscale/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtertext/group"/>
+            <!-- conditionally #included in imageeditor_build: need to fix
+        <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
+         -->
+          </component>
+          <component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/imageeditorutils/group"/>
+          </component>
+          <component name="systemparameters" filter="s60" long-name="System Parameters">
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/systemparameters/group"/>
+          </component>
+          <component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/enginewrapper/group"/>
+          </component>
+          <component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
+            <!-- should distribute this to the other components -->
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/group"/>
+          </component>
+          <component name="imgeditor_api_tests" filter="s60,api_test" long-name="Image Editor Engine API Tests" purpose="development">
+            <unit bldFile="/sf/app/imgeditor/imageeditorengine/tsrc/public/basic/group"/>
+          </component>
+        </collection>
+        <collection name="imgeditor_info" long-name="Image Editor Apps Info" level="ui">
+          <component name="imgeditor_plat" filter="s60" long-name="Image Editor Apps Platform Interfaces" class="api">
+            <unit bldFile="/sf/app/imgeditor/imgeditor_plat/group"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>
diff -r af857589b11a -r 82a6c2dffce1 symbian3/app/imgeditor/package_definition_3.0.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/imgeditor/package_definition_3.0.xml	Fri Jan 29 14:35:06 2010 +0000
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="imgeditor" name="Image Editor Apps" levels="engine ui">
+    <collection id="imageeditor" name="Image Editor UI" level="ui">
+      <component id="pb" filter="s60" name="Plugin Base">
+        <unit bldFile="imageeditor/pb/group"/>
+      </component>
+      <component id="iepb" filter="s60" name="Image Editor Plugin Base">
+        <unit bldFile="imageeditor/iepb/group"/>
+      </component>
+      <component id="imageeditorui" filter="s60" name="Image Editor UI">
+        <unit bldFile="imageeditor/imageeditorui/group"/>
+      </component>
+      <component id="imageeditormanager" filter="s60" name="Image Editor Manager">
+        <unit bldFile="imageeditor/imageeditormanager/group"/>
+      </component>
+      <component id="imageeditorapp" filter="s60" name="Image Editor Application">
+        <unit bldFile="imageeditor/imageeditorapp/group"/>
+      </component>
+      <component id="imageeditor_plugins" filter="s60" name="Image Editor Plugins" class="plugin">
+      	<!-- can only have one unit. Need to include all from a single bld.inf -->
+        <unit bldFile="imageeditor/plugins/blackwhiteplugin/group"/>
+        <unit bldFile="imageeditor/plugins/brightnessplugin/group"/>
+        <unit bldFile="imageeditor/plugins/bubbleplugin/group"/>
+        <unit bldFile="imageeditor/plugins/cartoonizeplugin/group"/>
+        <unit bldFile="imageeditor/plugins/clipartplugin/group"/>
+        <unit bldFile="imageeditor/plugins/contrastplugin/group"/>
+        <unit bldFile="imageeditor/plugins/cropplugin/group"/>
+        <unit bldFile="imageeditor/plugins/drawplugin/group"/>
+        <unit bldFile="imageeditor/plugins/frameplugin/group"/>
+        <unit bldFile="imageeditor/plugins/negativeplugin/group"/>
+        <unit bldFile="imageeditor/plugins/redeyeplugin/group"/>
+        <unit bldFile="imageeditor/plugins/resizeplugin/group"/>
+        <unit bldFile="imageeditor/plugins/rotatelplugin/group"/>
+        <unit bldFile="imageeditor/plugins/rotaterplugin/group"/>
+        <unit bldFile="imageeditor/plugins/sepiaplugin/group"/>
+        <unit bldFile="imageeditor/plugins/sharpnessplugin/group"/>
+        <unit bldFile="imageeditor/plugins/textplugin/group"/>
+        <!-- conditionally #included in imageeditor_build: need to fix
+        <unit bldFile="imageeditor/plugins/drawplugin/group"/>
+         -->
+      </component>
+      <component id="editorprovider" filter="s60" name="Image Editor Provider">
+        <unit bldFile="imageeditor/editorprovider/group"/>
+      </component>
+      <component id="imageeditor_build" filter="s60" name="Image Editor Build">
+      	<!-- should distribute this to the other components -->
+        <unit bldFile="imageeditor/group"/>
+      </component>
+    </collection>
+    <collection id="imageeditorengine" name="Image Editor Engine" level="engine">
+      <component id="filters" filter="s60" name="Image Editor Filters">
+      	<!-- can only have one unit. Need to include all from a single bld.inf -->
+        <unit bldFile="imageeditorengine/filters/filterbrightness/group"/>
+        <unit bldFile="imageeditorengine/filters/filterbubble/group"/>
+        <unit bldFile="imageeditorengine/filters/filterbuffer/group"/>
+        <unit bldFile="imageeditorengine/filters/filtercartoon/group"/>
+        <unit bldFile="imageeditorengine/filters/filterclipart/group"/>
+        <unit bldFile="imageeditorengine/filters/filtercontrast/group"/>
+        <unit bldFile="imageeditorengine/filters/filtercrop/group"/>
+        <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
+        <unit bldFile="imageeditorengine/filters/filterframe/group"/>
+        <unit bldFile="imageeditorengine/filters/filtergrayscale/group"/>
+        <unit bldFile="imageeditorengine/filters/filtericlsource/group"/>
+        <unit bldFile="imageeditorengine/filters/filterjpegsource/group"/>
+        <unit bldFile="imageeditorengine/filters/filterjpegtarget/group"/>
+        <unit bldFile="imageeditorengine/filters/filternegate/group"/>
+        <unit bldFile="imageeditorengine/filters/filterredeye/group"/>
+        <unit bldFile="imageeditorengine/filters/filterrotate/group"/>
+        <unit bldFile="imageeditorengine/filters/filterscale/group"/>
+        <unit bldFile="imageeditorengine/filters/filtersepia/group"/>
+        <unit bldFile="imageeditorengine/filters/filtersharpness/group"/>
+        <unit bldFile="imageeditorengine/filters/filtertext/group"/>
+        <!-- conditionally #included in imageeditor_build: need to fix
+        <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
+         -->
+      </component>
+      <component id="imageeditorutils" filter="s60" name="Image Editor Utilities">
+        <unit bldFile="imageeditorengine/imageeditorutils/group"/>
+      </component>
+      <component id="systemparameters" filter="s60" name="System Parameters">
+        <unit bldFile="imageeditorengine/systemparameters/group"/>
+      </component>
+      <component id="enginewrapper" filter="s60" name="Image Editor Engine Wrapper">
+        <unit bldFile="imageeditorengine/enginewrapper/group"/>
+      </component>
+      <component id="imageeditorengine_build" filter="s60" name="Image Editor Engine Build">
+      	<!-- should distribute this to the other components -->
+        <unit bldFile="imageeditorengine/group"/>
+      </component>
+		<component id="imgeditor_api_tests" filter="s60,api_test" name="Image Editor Engine API Tests" purpose="development">
+			<unit bldFile="imageeditorengine/tsrc/public/basic/group"/>
+		</component>            
+    </collection>
+    <collection id="imgeditor_info" name="Image Editor Apps Info" level="ui">
+      <component id="imgeditor_plat" filter="s60" name="Image Editor Apps Platform Interfaces" class="api">
+        <unit bldFile="imgeditor_plat/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r af857589b11a -r 82a6c2dffce1 symbian3/app/jrt/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/jrt/package_definition.xml	Fri Jan 29 14:35:06 2010 +0000
@@ -0,0 +1,103 @@
+<?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="app" long-name="Applications" levels="services apps">
+      <block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
+        <collection name="java_stubs" long-name="Java Stubs" level="util">
+          <component name="javadrmutils" long-name="Java DRM Utils" filter="s60">
+            <unit bldFile="/sf/app/jrt/java_stubs/jrtdrmutils/group"/>
+          </component>
+          <component name="javaenvinfo" long-name="Java Environment Info" filter="s60">
+            <unit bldFile="/sf/app/jrt/java_stubs/jrtenvinfo/group"/>
+          </component>
+          <component name="javaregistry" filter="s60" long-name="Java Registry">
+            <unit bldFile="/sf/app/jrt/java_stubs/jrtregistry/clientserver/client/group"/>
+          </component>
+          <component name="java_stubs_build" filter="s60" long-name="Java Stubs ROM">
+            <!-- Remove the #includes and rename JRT ROM-->
+            <unit bldFile="/sf/app/jrt/java_stubs/group"/>
+          </component>
+        </collection>
+        <collection name="jrt_info" long-name="JRT Info" level="rt">
+          <component name="jrt_plat" filter="s60" long-name="JRT Platform Interfaces" class="api">
+            <unit bldFile="/sf/app/jrt/jrt_plat/group"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>
diff -r af857589b11a -r 82a6c2dffce1 symbian3/app/jrt/package_definition_3.0.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/jrt/package_definition_3.0.xml	Fri Jan 29 14:35:06 2010 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="jrt" name="Java Runtime" levels="util generic rt ui">
+    <collection id="java_stubs" name="Java Stubs" level="util">
+   	<meta rel="config">
+   		<defined condition="__JAVA_STUBS"/>
+   	</meta>  
+      <component id="javadrmutils" name="Java DRM Utils" filter="s60">
+       <unit bldFile="java_stubs/jrtdrmutils/group"/>
+     </component>
+      <component id="javaenvinfo" name="Java Environment Info" filter="s60">
+       <unit bldFile="java_stubs/jrtenvinfo/group"/>
+     </component>
+      <component id="javaregistry" filter="s60" name="Java Registry">
+        <unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>
+      </component>
+      <component id="java_stubs_build" filter="s60" name="Java Stubs ROM">
+		<!-- Remove the #includes and rename JRT ROM-->
+        <unit bldFile="java_stubs/group"/>
+      </component>
+    </collection>
+    <collection id="jrt_info" name="JRT Info" level="rt">
+      <component id="jrt_plat" filter="s60" name="JRT Platform Interfaces" class="api">
+        <unit bldFile="jrt_plat/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r af857589b11a -r 82a6c2dffce1 symbian3/app/videoeditor/package_definition.xml
--- a/symbian3/app/videoeditor/package_definition.xml	Fri Jan 29 11:54:00 2010 +0000
+++ b/symbian3/app/videoeditor/package_definition.xml	Fri Jan 29 14:35:06 2010 +0000
@@ -1,103 +1,143 @@
 <?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="app" long-name="Applications" levels="services apps">
-<block name="videoeditor" level="apps" long-name="Video Editor Apps"/>
-</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="app" long-name="Applications" levels="services apps">
+      <block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
+        <collection name="videditor" long-name="Video Editor" level="ui">
+          <component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
+            <unit bldFile="/sf/app/videoeditor/videditor/videoeditorcommon/group"/>
+          </component>
+          <component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
+            <unit bldFile="/sf/app/videoeditor/videditor/videoeditoruicomponents/group"/>
+          </component>
+          <component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
+            <unit bldFile="/sf/app/videoeditor/videditor/simplevideoeditor/group"/>
+          </component>
+          <component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
+            <unit bldFile="/sf/app/videoeditor/videditor/simplecutvideo/group"/>
+          </component>
+          <component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
+            <unit bldFile="/sf/app/videoeditor/videditor/videoprovider/group"/>
+          </component>
+          <component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
+            <!--  uncomment when supported
+      	<meta rel="config">
+      		<defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
+      	</meta>
+        <unit bldFile="videditor/manualvideoeditor/group"/> -->
+          </component>
+          <component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
+            <!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
+            <unit bldFile="/sf/app/videoeditor/videditor/group"/>
+          </component>
+        </collection>
+        <collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
+          <component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
+            <unit bldFile="/sf/app/videoeditor/videoeditorengine/audioeditorengine/group"/>
+          </component>
+          <component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
+            <unit bldFile="/sf/app/videoeditor/videoeditorengine/avcedit/group"/>
+          </component>
+          <component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
+            <unit bldFile="/sf/app/videoeditor/videoeditorengine/h263decoder/group"/>
+          </component>
+          <component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
+            <unit bldFile="/sf/app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
+          </component>
+          <component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
+            <unit bldFile="/sf/app/videoeditor/videoeditorengine/vedtranscoder/group"/>
+          </component>
+          <component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
+            <unit bldFile="/sf/app/videoeditor/videoeditorengine/vedengine/group"/>
+          </component>
+          <component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
+            <!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
+            <unit bldFile="/sf/app/videoeditor/videoeditorengine/group"/>
+          </component>
+          <component name="videoeditorengine_api" filter="s60,api_test" long-name="Video Editor Engine API Tests" purpose="development">
+            <unit bldFile="/sf/app/videoeditor/videoeditorengine/tsrc/public/basic/group"/>
+          </component>
+        </collection>
+        <collection name="videoeditor_info" long-name="Video Editor Apps Info" level="ui">
+          <component name="videoeditor_plat" filter="s60" long-name="Video Editor Apps Platform Interfaces" introduced="^2" class="api">
+            <unit bldFile="/sf/app/videoeditor/videoeditor_plat/group"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>
diff -r af857589b11a -r 82a6c2dffce1 symbian3/app/videoeditor/package_definition_3.0.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/videoeditor/package_definition_3.0.xml	Fri Jan 29 14:35:06 2010 +0000
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="videoeditor" name="Video Editor Apps" levels="engine ui">
+    <collection id="videditor" name="Video Editor" level="ui">
+      <component id="videoeditorcommon" filter="s60" name="Video Editor Common" introduced="^2">
+        <unit bldFile="videditor/videoeditorcommon/group"/>
+      </component>
+      <component id="videoeditoruicomponents" filter="s60" name="Video Editor UI Components" introduced="^2">
+        <unit bldFile="videditor/videoeditoruicomponents/group"/>
+      </component>
+      <component id="simplevideoeditor" filter="s60" name="Simple Video Editor" introduced="^2">
+        <unit bldFile="videditor/simplevideoeditor/group"/>
+      </component>
+      <component id="simplecutvideo" filter="s60" name="Simple Cut Video" introduced="^2">
+        <unit bldFile="videditor/simplecutvideo/group"/>
+      </component>
+      <component id="videoprovider" filter="s60" name="Video Provider" introduced="^2">
+        <unit bldFile="videditor/videoprovider/group"/>
+      </component>
+      <component id="manualvideoeditor" filter="s60" name="Manual Video Editor" introduced="^2">
+      <!--  uncomment when supported
+      	<meta rel="config">
+      		<defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
+      	</meta>
+        <unit bldFile="videditor/manualvideoeditor/group"/> -->
+      </component>
+      <component id="videditor_build" filter="s60" name="Video Editor Build" introduced="^2">
+		<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
+        <unit bldFile="videditor/group"/>
+      </component>
+    </collection>
+    <collection id="videoeditorengine" name="Video Editor Engine" level="engine">
+      <component id="audioeditorengine" filter="s60" name="Audio Editor Engine" introduced="^2">
+        <unit bldFile="videoeditorengine/audioeditorengine/group"/>
+      </component>
+      <component id="avcedit" filter="s60" name="AVC Editing" introduced="^2">
+        <unit bldFile="videoeditorengine/avcedit/group"/>
+      </component>
+      <component id="h263decoder" filter="s60" name="H.263 Decoder" introduced="^2">
+        <unit bldFile="videoeditorengine/h263decoder/group"/>
+      </component>
+      <component id="mp3aacmaniplib" filter="s60" name="MP3 and AAC Manipulation Library" introduced="^2">
+        <unit bldFile="videoeditorengine/mp3aacmaniplib/group"/>
+      </component>
+      <component id="vedtranscoder" filter="s60" name="Video Editor Transcoder" introduced="^2">
+        <unit bldFile="videoeditorengine/vedtranscoder/group"/>
+      </component>
+      <component id="vedengine" filter="s60" name="Video Editor Engine" introduced="^2">
+        <unit bldFile="videoeditorengine/vedengine/group"/>
+      </component>
+      <component id="videoeditorengine_build" filter="s60" name="Video Editor Engine Build" introduced="^2">
+		<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
+        <unit bldFile="videoeditorengine/group"/>
+      </component>
+		<component id="videoeditorengine_api" filter="s60,api_test" name="Video Editor Engine API Tests" purpose="development">
+			<unit bldFile="videoeditorengine/tsrc/public/basic/group"/>
+		</component>                    
+    </collection>
+    <collection id="videoeditor_info" name="Video Editor Apps Info" level="ui">
+      <component id="videoeditor_plat" filter="s60" name="Video Editor Apps Platform Interfaces" class="api" introduced="^2">
+        <unit bldFile="videoeditor_plat/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r af857589b11a -r 82a6c2dffce1 symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml
--- a/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Fri Jan 29 11:54:00 2010 +0000
+++ b/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Fri Jan 29 14:35:06 2010 +0000
@@ -193,8 +193,8 @@
       <package id="utils" level="apps" tech-domain="pr" href="../../../../app/utils/package_definition_3.0.xml"/>
       <package id="dictionary" level="services" tech-domain="pr" href="../../../../app/dictionary/package_definition_3.0.xml"/>
       <package id="camera" level="apps" tech-domain="ma" href="../../../../app/camera/package_definition_3.0.xml"/>
-      <package id="imgeditor" level="apps" tech-domain="ma" name="Image Editor Apps"/>
-      <package id="videoeditor" level="apps" tech-domain="ma" name="Video Editor Apps"/>
+      <package id="imgeditor" level="apps" tech-domain="ma" href="../../../../app/imgeditor/package_definition_3.0.xml"/>
+      <package id="videoeditor" level="apps" tech-domain="ma" href="../../../../app/videoeditor/package_definition_3.0.xml"/>
       <package id="videoplayer" level="apps" tech-domain="ma" href="../../../../app/videoplayer/package_definition_3.0.xml"/>
       <package id="photos" level="apps" tech-domain="ma" href="../../../../app/photos/package_definition_3.0.xml"/>
       <package id="musicplayer" level="apps" tech-domain="ma" href="../../../../app/musicplayer/package_definition_3.0.xml"/>