# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1268983665 -7200
# Node ID 21d7bcfe70dc69874831f0f0b1d57a9da97edce3
# Parent  255dd6e7afb678efcbc949247a64cdba5fe8f614
Revision: v2.1.13
Kit: 201011

diff -r 255dd6e7afb6 -r 21d7bcfe70dc Makefile
--- a/Makefile	Tue Feb 02 00:05:58 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: Main makefile of Java, run when building app layer
-#
-
-override JAVA_SRC_ROOT = $(CURDIR)
-export JAVA_SRC_ROOT
-
-include $(JAVA_SRC_ROOT)/build/makefile
diff -r 255dd6e7afb6 -r 21d7bcfe70dc bld.inf
--- a/bld.inf	Tue Feb 02 00:05:58 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Generated bld.inf -file
-*
-*/
-
-PRJ_PLATFORMS
-default
-
-#include "javacommons/bld.inf"    
-#include "javaruntimes/bld.inf"    
-#include "javauis/bld.inf"    
-#include "javamanager/bld.inf"    
-#include "javatools/bld.inf"    
-#include "javaextensions/bld.inf"    
-#include "jrt_plat/group/bld.inf"    
-#include "build/bld.inf"    
-#include "build/stubsis/bld.inf"  
diff -r 255dd6e7afb6 -r 21d7bcfe70dc group/bld.inf
--- a/group/bld.inf	Tue Feb 02 00:05:58 2010 +0200
+++ b/group/bld.inf	Fri Mar 19 09:27:45 2010 +0200
@@ -22,6 +22,5 @@
 #include "../java_stubs/group/bld.inf"
 #include "../jrt_plat/group/bld.inf"
 #else
-#include "../build/bldjava.inf"
 #include "../bld.inf"
 #endif // __JAVA_STUBS
diff -r 255dd6e7afb6 -r 21d7bcfe70dc jrt.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jrt.pro	Fri Mar 19 09:27:45 2010 +0200
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: Generated file - do not edit manually
+#
+TEMPLATE = subdirs
+SUBDIRS += build/nativejava/nativejava.pro 
+SUBDIRS += javacommons 
+SUBDIRS += javaruntimes 
+SUBDIRS += javauis 
+SUBDIRS += javamanager 
+SUBDIRS += javatools 
+SUBDIRS += javaextensions 
+BLD_INF_RULES.prj_extensions += "$${LITERAL_HASH}include \"jrt_plat/group/bld.inf\""  
+BLD_INF_RULES.prj_extensions += "$${LITERAL_HASH}include \"build/stubsis/bld.inf\""  
+BLD_INF_RULES.prj_extensions += "prj_extensions" 
diff -r 255dd6e7afb6 -r 21d7bcfe70dc jrt_plat/java_debug_api/java_debug_api.metaxml
--- a/jrt_plat/java_debug_api/java_debug_api.metaxml	Tue Feb 02 00:05:58 2010 +0200
+++ b/jrt_plat/java_debug_api/java_debug_api.metaxml	Fri Mar 19 09:27:45 2010 +0200
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" ?>
 <api id="fb4b8d56e86ecb8152a0d3b2be8880c8" dataversion="2.0">
   <name>Java Debug API</name>
-  <description>Java Debug API allows it's users to install, remove, start and stop Java applications. Java application can be launched with Universal Emulator Interface (UEI) arguments that can be used to start JVM in debug mode.</description>
+  <description>Java Debug API allows its users to install, remove, start and stop Java applications. Java application can be launched with Universal Emulator Interface (UEI) arguments that can be used to start JVM in debug mode.</description>
   <type>c++</type>
   <collection>javamanager</collection>
   <libs>
diff -r 255dd6e7afb6 -r 21d7bcfe70dc jrt_plat/java_env_info_api/java_env_info_api.metaxml
--- a/jrt_plat/java_env_info_api/java_env_info_api.metaxml	Tue Feb 02 00:05:58 2010 +0200
+++ b/jrt_plat/java_env_info_api/java_env_info_api.metaxml	Fri Mar 19 09:27:45 2010 +0200
@@ -1,17 +1,14 @@
 <?xml version="1.0" ?>
-<api id="935dbdc2b6dfe73953cf5cc603647d36" dataversion="1.0">
+<api id="935dbdc2b6dfe73953cf5cc603647d36" dataversion="2.0">
   <name>Java Environment Info API</name>
   <description>This API provides information about the Java environment and events occurring within it</description>
   <type>c++</type>
-  <subsystem>java_dom</subsystem>
+  <collection>javacommons</collection>
   <libs>
     <lib name="javaenv.lib" />  
   </libs>
-  <release category="domain"/>
+  <release category="platform" sinceversion="3.2"/>
   <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
-     <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
      <htmldocprovided>no</htmldocprovided>
      <adaptation>no</adaptation>
   </attributes>
diff -r 255dd6e7afb6 -r 21d7bcfe70dc jrt_plat/java_registry_api/java_registry_api.metaxml
--- a/jrt_plat/java_registry_api/java_registry_api.metaxml	Tue Feb 02 00:05:58 2010 +0200
+++ b/jrt_plat/java_registry_api/java_registry_api.metaxml	Fri Mar 19 09:27:45 2010 +0200
@@ -9,9 +9,6 @@
   </libs>
   <release category="platform" sinceversion="3.2"/>
   <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
-     <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
      <htmldocprovided>no</htmldocprovided>
      <adaptation>no</adaptation>
   </attributes>
diff -r 255dd6e7afb6 -r 21d7bcfe70dc layers.sysdef.xml
--- a/layers.sysdef.xml	Tue Feb 02 00:05:58 2010 +0200
+++ b/layers.sysdef.xml	Fri Mar 19 09:27:45 2010 +0200
@@ -1,23 +1,27 @@
 <?xml version="1.0"?>
-<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
+<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_5_1.dtd" [
   <!ENTITY layer_real_source_path "sf/app/jrt" >
 ]>
 
-<SystemDefinition name="jrt" schema="1.4.0">
+<SystemDefinition name="jrt" schema="1.5.1">
   <systemModel>
     <layer name="app_layer">
       <module name="jrt">
-        <unit unitID="jrt.jrt" mrp="" bldFile="&layer_real_source_path;/group"
-        filter="!sf_build" name="jrt" />
+        <unit name="jrt" unitID="jrt.jrt" mrp=""
+              bldFile="&layer_real_source_path;" proFile="jrt.pro" qmakeArgs="-r"
+              filter="!sf_build" />
       </module>
       <module name="jrt">
-        <unit unitID="jrt.jrt.jrt_plat" mrp="" bldFile="&layer_real_source_path;/jrt_plat/group"
-        filter="sf_build" name="jrt_jrt_plat" />
+        <unit name="jrt_jrt_plat" unitID="jrt.jrt.jrt_plat" mrp=""
+              bldFile="&layer_real_source_path;/jrt_plat/group"
+              filter="sf_build"  />
       </module>
       <module name="jrt">
-        <unit unitID="jrt.jrt.java_stubs" mrp="" bldFile="&layer_real_source_path;/java_stubs/group"
-        filter="sf_build" name="jrt_jrt_stubs" />
+        <unit name="jrt_jrt_stubs" unitID="jrt.jrt.java_stubs" mrp=""
+              bldFile="&layer_real_source_path;/java_stubs/group"
+              filter="sf_build" />
       </module>
+
     </layer>
   </systemModel>
 </SystemDefinition>
diff -r 255dd6e7afb6 -r 21d7bcfe70dc subsystem.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/subsystem.mk	Fri Mar 19 09:27:45 2010 +0200
@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: Main makefile of Java, run when building app layer
+#
+
+override JAVA_SRC_ROOT = $(CURDIR)
+export JAVA_SRC_ROOT
+
+include $(JAVA_SRC_ROOT)/build/makefile
diff -r 255dd6e7afb6 -r 21d7bcfe70dc sysdef_1_5_1.dtd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sysdef_1_5_1.dtd	Fri Mar 19 09:27:45 2010 +0200
@@ -0,0 +1,88 @@
+ <!ELEMENT SystemDefinition (systemModel?, build?)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (logicalset* | module*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  levels CDATA #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalset name CDATA #REQUIRED>
+ <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalsubset name CDATA #REQUIRED>
+ <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
+ <!ATTLIST module
+  name CDATA #REQUIRED
+  level CDATA #IMPLIED>
+ <!ELEMENT component (unit* | package* | prebuilt*)*>
+ <!ATTLIST component name CDATA #REQUIRED>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  unitID ID #REQUIRED
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  bldFile CDATA #REQUIRED
+  priority CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  proFile CDATA #IMPLIED
+  qmakeArgs CDATA #IMPLIED>
+ <!ELEMENT package EMPTY>
+ <!ATTLIST package
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT prebuilt EMPTY>
+ <!ATTLIST prebuilt
+  name CDATA #REQUIRED
+  version CDATA #REQUIRED
+  late (Y|N) #IMPLIED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
+ <!ELEMENT unitList (unitRef+)>
+ <!ATTLIST unitList
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT unitRef EMPTY>
+ <!ATTLIST unitRef unit IDREF #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 | y | n) #REQUIRED>
+ <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
+ <!ELEMENT unitListRef EMPTY>
+ <!ATTLIST unitListRef unitList IDREF #REQUIRED>
+ <!ELEMENT layerRef EMPTY>
+ <!ATTLIST layerRef layerName CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y | N | y | n) #REQUIRED
+  targetParallel (Y | N | y | n) #IMPLIED>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  command CDATA #REQUIRED>