# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1266423090 0
# Node ID 3142324011cfe060023540cbef7b910ad1991952
# Parent  8ae69391a51ae1e1cbeaf61f9efe8762f003bc31
Fix configurations in JRT pkg. Add missing stub in mmmw

diff -r 8ae69391a51a -r 3142324011cf symbian3/app/jrt/package_definition.xml
--- a/symbian3/app/jrt/package_definition.xml	Wed Feb 17 12:59:32 2010 +0000
+++ b/symbian3/app/jrt/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
@@ -78,24 +78,29 @@
     <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"/>
+          <!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
+          <component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
+            <!--<unit bldFile="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 name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
+            <!--<unit bldFile="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 name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
+            <!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
           </component>
-          <component name="java_stubs_build" filter="s60" long-name="Java Stubs ROM">
+          <component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
             <!-- Remove the #includes and rename JRT ROM-->
-            <unit bldFile="/sf/app/jrt/java_stubs/group"/>
+            <!--<unit bldFile="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>
+          <component name="jrt_build" filter="s60" long-name="JRT Build">
+            <!--  needed for __JAVA_STUBS condition -->
+            <unit bldFile="/sf/app/jrt/group"/>
+          </component>
         </collection>
       </block>
     </layer>
diff -r 8ae69391a51a -r 3142324011cf symbian3/app/jrt/package_definition_3.0.xml
--- a/symbian3/app/jrt/package_definition_3.0.xml	Wed Feb 17 12:59:32 2010 +0000
+++ b/symbian3/app/jrt/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
@@ -5,24 +5,29 @@
    	<meta rel="config">
    		<defined condition="__JAVA_STUBS"/>
    	</meta>  
-      <component id="javadrmutils" name="Java DRM Utils" filter="s60">
-       <unit bldFile="java_stubs/jrtdrmutils/group"/>
+	<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
+      <component id="javadrmutils" name="Java DRM Utils" filter="s60,sf_build">
+       <!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
      </component>
-      <component id="javaenvinfo" name="Java Environment Info" filter="s60">
-       <unit bldFile="java_stubs/jrtenvinfo/group"/>
+      <component id="javaenvinfo" name="Java Environment Info" filter="s60,sf_build">
+       <!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
      </component>
-      <component id="javaregistry" filter="s60" name="Java Registry">
-        <unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>
+      <component id="javaregistry" filter="s60,sf_build" name="Java Registry">
+        <!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
       </component>
-      <component id="java_stubs_build" filter="s60" name="Java Stubs ROM">
+      <component id="java_stubs_build" filter="s60,sf_build" name="Java Stubs ROM">
 		<!-- Remove the #includes and rename JRT ROM-->
-        <unit bldFile="java_stubs/group"/>
+        <!--<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>
+		<component id="jrt_build" filter="s60" name="JRT Build">
+			<!--  needed for __JAVA_STUBS condition -->
+			<unit bldFile="group"/>
+		</component>
     </collection>
   </package>
 </SystemDefinition>
diff -r 8ae69391a51a -r 3142324011cf symbian3/mw/mmmw/package_definition.xml
--- a/symbian3/mw/mmmw/package_definition.xml	Wed Feb 17 12:59:32 2010 +0000
+++ b/symbian3/mw/mmmw/package_definition.xml	Wed Feb 17 16:11:30 2010 +0000
@@ -129,6 +129,9 @@
           <component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
             <unit bldFile="/sf/mw/mmmw/mmserv/voipaudioservices/group"/>
           </component>
+          <component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
+            <unit bldFile="/sf/mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
+          </component>
         </collection>
         <collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
           <component name="mmmw_test" filter="s60,api_test,pref_test" long-name="Multimedia Middleware Tests" purpose="development">
diff -r 8ae69391a51a -r 3142324011cf symbian3/mw/mmmw/package_definition_3.0.xml
--- a/symbian3/mw/mmmw/package_definition_3.0.xml	Wed Feb 17 12:59:32 2010 +0000
+++ b/symbian3/mw/mmmw/package_definition_3.0.xml	Wed Feb 17 16:11:30 2010 +0000
@@ -53,6 +53,9 @@
       <component id="voipaudioservices" filter="s60" name="VoIP Audio Services">
         <unit bldFile="mmserv/voipaudioservices/group"/>
       </component>
+      <component id="lib3gpextparser" filter="s60"  name="3GP Extension Metadata Parser Library">
+        <unit bldFile="mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
+      </component>
     </collection>    
     <collection id="mmmw_info" name="Multimedia Middleware Info" level="specific">
       <component id="mmmw_test" filter="s60,api_test,pref_test" name="Multimedia Middleware Tests" purpose="development">