--- a/Makefile	Mon Mar 15 12:39:56 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

--- a/java_stubs/javadebugapi/bwins/javadebugapiu.def	Mon Mar 15 12:39:56 2010 +0200
+++ b/java_stubs/javadebugapi/bwins/javadebugapiu.def	Wed Mar 31 21:20:09 2010 +0300
@@ -1,7 +1,7 @@
 EXPORTS
-	?installApp@debug@java@@YAHAAVHBufC16@@AAVTUid@@AAV?$RArray@VTUid@@@@@Z @ 1 NONAME ; int java::debug::installApp(class HBufC16 &, class TUid &, class RArray<class TUid> &)
-	?startApp@debug@java@@YAHVTUid@@AAVHBufC16@@@Z @ 2 NONAME ; int java::debug::startApp(class TUid, class HBufC16 &)
-	?stopApp@debug@java@@YAHVTUid@@@Z @ 3 NONAME ; int java::debug::stopApp(class TUid)
+	?createInstance@JavaDiagnostic@debug@java@@SAPAV123@XZ @ 1 NONAME ; class java::debug::JavaDiagnostic * java::debug::JavaDiagnostic::createInstance(void)
+	?stopApp@debug@java@@YAHVTUid@@@Z @ 2 NONAME ; int java::debug::stopApp(class TUid)
+	?startApp@debug@java@@YAHVTUid@@AAVHBufC16@@AAVTProcessId@@@Z @ 3 NONAME ; int java::debug::startApp(class TUid, class HBufC16 &, class TProcessId &)
 	?uninstallApp@debug@java@@YAHVTUid@@@Z @ 4 NONAME ; int java::debug::uninstallApp(class TUid)
-	?createInstance@JavaDiagnostic@debug@java@@SAPAV123@XZ @ 5 NONAME ; class java::debug::JavaDiagnostic * java::debug::JavaDiagnostic::createInstance(void)
+	?installApp@debug@java@@YAHAAVHBufC16@@AAVTUid@@AAV?$RArray@VTUid@@@@@Z @ 5 NONAME ; int java::debug::installApp(class HBufC16 &, class TUid &, class RArray<class TUid> &)
 

--- a/java_stubs/javadebugapi/eabi/javadebugapiu.def	Mon Mar 15 12:39:56 2010 +0200
+++ b/java_stubs/javadebugapi/eabi/javadebugapiu.def	Wed Mar 31 21:20:09 2010 +0300
@@ -1,7 +1,7 @@
 EXPORTS
 	_ZN4java5debug10installAppER7HBufC16R4TUidR6RArrayIS3_E @ 1 NONAME
 	_ZN4java5debug12uninstallAppE4TUid @ 2 NONAME
-	_ZN4java5debug7stopAppE4TUid @ 3 NONAME
-	_ZN4java5debug8startAppE4TUidR7HBufC16 @ 4 NONAME
-	_ZN4java5debug14JavaDiagnostic14createInstanceEv @ 5 NONAME
+	_ZN4java5debug14JavaDiagnostic14createInstanceEv @ 3 NONAME
+	_ZN4java5debug7stopAppE4TUid @ 4 NONAME
+	_ZN4java5debug8startAppE4TUidR7HBufC16R10TProcessId @ 5 NONAME
 

--- a/java_stubs/javadebugapi/src/javadebugapi.cpp	Mon Mar 15 12:39:56 2010 +0200
+++ b/java_stubs/javadebugapi/src/javadebugapi.cpp	Wed Mar 31 21:20:09 2010 +0300
@@ -35,7 +35,7 @@
 }
 
 EXPORT_C
-TBool java::debug::startApp(TUid /*aApplicationUid*/, HBufC& /*aUeiParameters*/)
+TBool java::debug::startApp(TUid /*aApplicationUid*/, HBufC& /*aUeiParameters*/, TProcessId& /*aProcessId*/)
 {
     return EFalse;
 }

--- a/jrt_plat/java_debug_api/inc/javadebugapi.h	Mon Mar 15 12:39:56 2010 +0200
+++ b/jrt_plat/java_debug_api/inc/javadebugapi.h	Wed Mar 31 21:20:09 2010 +0300
@@ -20,6 +20,7 @@
 #define JAVADEBUGAPI_H
 
 #include <e32cmn.h>
+#include <e32std.h>
 
 /**
  * Java Debug API allows it's users to install, remove, start and
@@ -59,6 +60,7 @@
  * Starts Java application.
  * @param[in] aApplicationUid application uid
  * @param[in] aUeiParameters includes arguments defined in Unified Emulator Interface (UEI) specification.
+ * @param[out] aProcessId process id of the launched Java application, valid if application is launched successfully
  * If aUeiParameters contains unsupported options then those options are discarded silently.
  * Supported arguments:
  *   -Xverbose[:options]
@@ -69,7 +71,7 @@
  * @capability NetworkControl
  * @return true if application is started
  */
-IMPORT_C TBool startApp(TUid aApplicationUid, HBufC& aUeiParameters);
+IMPORT_C TBool startApp(TUid aApplicationUid, HBufC& aUeiParameters, TProcessId& aProcessId);
 
 /**
  * Stops Java application.