--- a/build/Makefile.comp	Thu May 27 12:49:31 2010 +0300
+++ b/build/Makefile.comp	Fri Jun 11 13:33:44 2010 +0300
@@ -179,11 +179,11 @@
 
 build_native:
 	$(PHASEINFO)
-	$(SBS) -c $(PLATFORM)_$(CFG) BUILD
+	$(SBS) -c $(PLATFORM)_$(CFG)
 
-fastbuild: export java
+fastbuild: java
 	$(PHASEINFO)
-	$(SBS) -c $(PLATFORM)_$(CFG) TARGET
+	$(SBS) -c $(PLATFORM)_$(CFG)
 
 build_clean_native:
 	$(PHASEINFO)

--- a/build/Makefile.project	Thu May 27 12:49:31 2010 +0300
+++ b/build/Makefile.project	Fri Jun 11 13:33:44 2010 +0300
@@ -180,7 +180,7 @@
   # Following flag enables application notifications to AppArc.
   PROJECT_DEFINES += RD_JAVA_USIF_NOTIFY_APP_ARC
   # Following flag enables installation progress notifications through USIF.
-  #PROJECT_DEFINES += RD_JAVA_USIF_NOTIFY_PROGRESS
+  PROJECT_DEFINES += RD_JAVA_USIF_NOTIFY_PROGRESS
 endif
 
 # Java proximity Listener support exsist in 9.2 only(can not be used if 5.0 untill IAD dependecy mentioned)

--- a/build/Makefile.subsystem	Thu May 27 12:49:31 2010 +0300
+++ b/build/Makefile.subsystem	Fri Jun 11 13:33:44 2010 +0300
@@ -206,7 +206,7 @@
 	$(SBS) -c $(PLATFORM)_$(CFG)
 
 fastbuild: export java
-	$(SBS) -c $(PLATFORM)_$(CFG) TARGET
+	$(SBS) -c $(PLATFORM)_$(CFG)
 
 clean_native:
 	$(PHASEINFO)

--- a/build/bld.inf	Thu May 27 12:49:31 2010 +0300
+++ b/build/bld.inf	Fri Jun 11 13:33:44 2010 +0300
@@ -42,6 +42,10 @@
 ../rom/tckrunnerodclist30 /epoc32/release/winscw/urel/z/resource/java/tckrunnerodclist
 ../rom/tckrunnerodclist30 /epoc32/data/z/resource/java/tckrunnerodclist
 
+../rom/javacontrolpanelodclist30 /epoc32/release/winscw/udeb/z/resource/java/javacontrolpanelodclist
+../rom/javacontrolpanelodclist30 /epoc32/release/winscw/urel/z/resource/java/javacontrolpanelodclist
+../rom/javacontrolpanelodclist30 /epoc32/data/z/resource/java/javacontrolpanelodclist
+
 ../rom/javalocalization_3_1.iby        LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(javalocalization.iby)
 
 #else // RD_JAVA_UI_QT
@@ -61,6 +65,10 @@
 ../rom/tckrunnerodclist /epoc32/release/winscw/urel/z/resource/java/tckrunnerodclist
 ../rom/tckrunnerodclist /epoc32/data/z/resource/java/tckrunnerodclist
 
+../rom/javacontrolpanelodclist /epoc32/release/winscw/udeb/z/resource/java/javacontrolpanelodclist
+../rom/javacontrolpanelodclist /epoc32/release/winscw/urel/z/resource/java/javacontrolpanelodclist
+../rom/javacontrolpanelodclist /epoc32/data/z/resource/java/javacontrolpanelodclist
+
 ../rom/javalocalization_2_1.iby        LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(javalocalization.iby)
 
 #endif // RD_JAVA_UI_QT

--- a/build/buildutils/checkcopyrights.py	Thu May 27 12:49:31 2010 +0300
+++ b/build/buildutils/checkcopyrights.py	Fri Jun 11 13:33:44 2010 +0300
@@ -13,48 +13,54 @@
 # Contributors:
 #
 # Description:
-#   Checks that all the source files have a proper copyright header. 
+#   Checks that all the source files have a proper EPL copyright header.
 #   Ignores number of known 3rd party source files and directories.
 #
-#    Run this script on a clean workarea in order to avoid warnings
-#    about exported files and qmake generated files.
+#   Run this script on a clean workarea in order to avoid warnings
+#   about exported files and qmake generated files.
 #
-#    The excluded directories should be checked every now and then
-#    so that there won't be other problems (like files without any
-#    header).
+#   The excluded directories should be checked every now and then
+#   so that there won't be other problems (like files without any header).
 
 import sys, os, re
 
 # Specify here the file types to be checked
 checkedFileTypes = [".cpp", ".h", ".java", ".py", ".mk"]
 
-# Include here the directories to be ignored
-ignoredDirectories = [
-    "javaextensions\\bluetooth\\bluecove",  # Bluecove
-    "javacommons\\jvms\\j9\\s60\\inc",      # IBM J9
-    "javauis\\eswt_akn",                    # eSWT checked separately
-    "javauis\\eswt_qt",                     # eSWT checked separately
-    "javauis\\tsrc\\fute\\eswt\\",          # eSWT checked separately
-    "javaextensions\\webservices",          # Webservices not delivered
-    "jrt\\tools",                           # Tools not delivered
-    "\\internal"                            # Internal directories not delivered
-    ]
 
-# Include here any individual files to be ignored
-ignoredFiles = [
-    "javacommons\\jvms\\cldc_1.1.1\\javasrc\\java\\util\\Timer.java",       # Apache license
-    "javacommons\\jvms\\cldc_1.1.1\\javasrc\\java\\util\\TimerTask.java",   # Apache license
-    "javacommons\\jvms\\cldc_1.1.1\\tsrc\\javasrc\\com\\nokia\\mj\\test\\java\\util\\TimerTaskTest.java",   # Apache license
-    "javacommons\\jvms\\cldc_1.1.1\\tsrc\\javasrc\\com\\nokia\\mj\\test\\java\\util\\TimerTest.java",       # Apache license
-    "javacommons\\utils\\inc\\convertutf.h",                                # Unicode Inc.
-    "javacommons\\utils\\src\\convertutf.cpp"                               # Unicode Inc.
-]
-
-# The copyright text to be checked
-copyrightText = "Nokia Corporation and/or its subsidiary(-ies)"
+# The copyright texts to be searched for
+copyrightText1 = "Nokia Corporation and/or its subsidiary(-ies)"
+copyrightText2 = "Eclipse Public License v1.0"
 
 
 def main():
+
+    root = sys.argv[1]
+    if root[-1] != '\\':
+        root = root + '\\'
+
+    # Include here the directories to be ignored
+    ignoredDirectories = [
+        root + "javaextensions\\bluetooth\\bluecove",  # Bluecove
+        root + "javacommons\\jvms\\j9\\s60\\inc",      # IBM J9
+        root + "javauis\\eswt_akn",                    # eSWT checked separately
+        root + "javauis\\eswt_qt",                     # eSWT checked separately
+        root + "javauis\\tsrc\\fute\\eswt\\",          # eSWT checked separately
+        root + "javaextensions\\webservices",          # Webservices not delivered
+        root + "tools",                                # Tools not delivered
+        "\\internal"                                   # Internal directories not delivered
+        ]
+     
+    # Include here any individual files to be ignored
+    ignoredFiles = [
+        root + "javacommons\\jvms\\cldc_1.1.1\\javasrc\\java\\util\\Timer.java",       # Apache license
+        root + "javacommons\\jvms\\cldc_1.1.1\\javasrc\\java\\util\\TimerTask.java",   # Apache license
+        root + "javacommons\\jvms\\cldc_1.1.1\\tsrc\\javasrc\\com\\nokia\\mj\\test\\java\\util\\TimerTaskTest.java",   # Apache license
+        root + "javacommons\\jvms\\cldc_1.1.1\\tsrc\\javasrc\\com\\nokia\\mj\\test\\java\\util\\TimerTest.java",       # Apache license
+        root + "javacommons\\utils\\inc\\convertutf.h",                                # Unicode Inc.
+        root + "javacommons\\utils\\src\\convertutf.cpp"                               # Unicode Inc.
+    ]
+
     
     def visitFun(arg, dirname, names):
 
@@ -94,16 +100,29 @@
                 # print "Ignoring file", f
                 continue
 
-            # Check if the file contains the copyright text
+            # Check if the file contains the copyright texts
             try:                       
                 file = open(fname)
+                
+                # Search for the first text
                 found = False
                 line = file.readline()
                 while line != "":
-                    if copyrightText in line:
+                    if copyrightText1 in line:
                         found = True
                         break;
-                    line = file.readline()                
+                    line = file.readline()
+                
+                # Search the second copyright text as well
+                if found:
+                    found = False
+                    line = file.readline()
+                    while line != "":
+                        if copyrightText2 in line:
+                            found = True
+                            break;
+                        line = file.readline()
+
                 file.close()
                                     
             except IOError:
@@ -112,8 +131,8 @@
             if not found:
                 print fname
                 continue
-                
-    os.path.walk(sys.argv[1], visitFun, None)
+    
+    os.path.walk(root, visitFun, None)
 
 
 if __name__ == "__main__":

--- a/build/buildutils/checkfilenames.py	Thu May 27 12:49:31 2010 +0300
+++ b/build/buildutils/checkfilenames.py	Fri Jun 11 13:33:44 2010 +0300
@@ -42,7 +42,7 @@
     ".cvsignore", ".dat", ".dcf", ".def", ".defs", ".dll", ".der", ".doc",
     ".dr", ".dso", ".dsp", ".dsw", ".dtd",
     ".emx", ".exe", ".flm", ".gcfml", ".gif",
-    ".h", ".hrh", ".html", ".iby", ".inf", ".ini", ".inl",
+    ".h", ".hrh", ".htm", ".html", ".iby", ".inf", ".ini", ".inl",
     ".jad", ".jar", ".java", ".javaversion", ".jpeg", ".jpg", ".js", ".jsp", ".jupiter",
     ".key", ".ks", ".launch", ".lib", ".loc", ".log",
     ".mak", ".make", "makefile", "makefile_akn", "makefile_qt",  "manifest", ".mbm", ".mdl",
@@ -64,6 +64,7 @@
 # Other peculiar filenames:
     "installerodclist", "installerodclist30", "midpodclist", "midpodclist30",
     "notice", "package-list", "tckrunnerodclist", "tckrunnerodclist30", "unknowncert","midprootslist",
+    "javacontrolpanelodclist", "javacontrolpanelodclist30",
 ]
 
 # Command line options.

--- a/build/buildutils/checkjavapackages.py	Thu May 27 12:49:31 2010 +0300
+++ b/build/buildutils/checkjavapackages.py	Fri Jun 11 13:33:44 2010 +0300
@@ -16,13 +16,17 @@
 #   Checks that all the java source files declare a package and that 
 #   the directory within a java source file is located corresponds
 #   properly to the package.
+#
+#   Ignores tsrc directories unless the option -all is given.
 
 import sys, os, re
 
 
 def main():
 
-    files = []
+    root = sys.argv[1]
+    all = len(sys.argv) > 2 and sys.argv[2] == '-all'
+    
     
     # Create a reg exp matching to "package x.y.z;" with whitespace ignored
     regex = re.compile("\\s*package\\s*([\\w.]*);.*", re.IGNORECASE)
@@ -31,8 +35,12 @@
 
         # Skip SVN directories
         if dirname.find("\\.svn") != -1:
-            return names
+            return
             
+        # Skip tsrc
+        if not all and dirname.find("\\tsrc") != -1:
+            return
+                    
         for f in names:
             if not f.endswith(".java"):
                 continue
@@ -63,7 +71,7 @@
             except IOError:
                 print "Error reading the file " + fname
                 
-    os.path.walk(sys.argv[1], visitFun, files)
+    os.path.walk(sys.argv[1], visitFun, None)
 
 
 if __name__ == "__main__":

--- a/build/exports.inf	Thu May 27 12:49:31 2010 +0300
+++ b/build/exports.inf	Fri Jun 11 13:33:44 2010 +0300
@@ -40,6 +40,10 @@
 ../rom/tckrunnerodclist30 /epoc32/release/winscw/urel/z/resource/java/tckrunnerodclist
 ../rom/tckrunnerodclist30 /epoc32/data/z/resource/java/tckrunnerodclist
 
+../rom/javacontrolpanelodclist30 /epoc32/release/winscw/udeb/z/resource/java/javacontrolpanelodclist
+../rom/javacontrolpanelodclist30 /epoc32/release/winscw/urel/z/resource/java/javacontrolpanelodclist
+../rom/javacontrolpanelodclist30 /epoc32/data/z/resource/java/javacontrolpanelodclist
+
 ../rom/javalocalization_3_1.iby        LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(javalocalization.iby)
 
 #else // RD_JAVA_UI_QT
@@ -59,6 +63,10 @@
 ../rom/tckrunnerodclist /epoc32/release/winscw/urel/z/resource/java/tckrunnerodclist
 ../rom/tckrunnerodclist /epoc32/data/z/resource/java/tckrunnerodclist
 
+../rom/javacontrolpanelodclist /epoc32/release/winscw/udeb/z/resource/java/javacontrolpanelodclist
+../rom/javacontrolpanelodclist /epoc32/release/winscw/urel/z/resource/java/javacontrolpanelodclist
+../rom/javacontrolpanelodclist /epoc32/data/z/resource/java/javacontrolpanelodclist
+
 ../rom/javalocalization_2_1.iby        LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(javalocalization.iby)
 
 #endif // RD_JAVA_UI_QT

--- a/build/makefile.javaversion	Thu May 27 12:49:31 2010 +0300
+++ b/build/makefile.javaversion	Fri Jun 11 13:33:44 2010 +0300
@@ -1,6 +1,2 @@
 # Set Java version (must be dot separated, without spaces)
-ifdef RD_JAVA_S60_RELEASE_5_0_IAD
-  JAVA_VERSION = 2.1.26
-else 
-  JAVA_VERSION = 2.1.26
-endif
+JAVA_VERSION = 2.2.1

--- a/build/sis/java_2_0.pkg	Thu May 27 12:49:31 2010 +0300
+++ b/build/sis/java_2_0.pkg	Fri Jun 11 13:33:44 2010 +0300
@@ -102,6 +102,7 @@
 "\epoc32\data\z\resource\java\midpodclist"-"c:\resource\java\midpodclist"
 "\epoc32\data\z\resource\java\tckrunnerodclist"-"c:\resource\java\tckrunnerodclist"
 "\epoc32\data\z\resource\java\installerodclist"-"c:\resource\java\installerodclist"
+"\epoc32\data\z\resource\java\javacontrolpanelodclist"-"c:\resource\java\javacontrolpanelodclist"
 
 
 
@@ -378,7 +379,7 @@
 "\epoc32\release\armv5\urel\z\resource\java\jvm\lib\jrt\javawmamms.odc"-"c:\resource\java\jvm\lib\jrt\javawmamms.odc"
 
 "\epoc32\release\armv5\urel\z\resource\java\jvm\lib\jrt\tckrunner.odc"-"c:\resource\java\jvm\lib\jrt\tckrunner.odc"
-
+"\epoc32\release\armv5\urel\z\resource\java\jvm\lib\jrt\javacontrolpanel.odc"-"c:\resource\java\jvm\lib\jrt\javacontrolpanel.odc"
 
 
 ; Misc dlls
@@ -491,6 +492,7 @@
 "\epoc32\release\armv5\urel\javacaptain_ext_pushregistryplugin.dll"     -"c:\sys\bin\javacaptain_ext_pushregistryplugin.dll"
 "\epoc32\release\armv5\urel\javacaptain_ext_storageserverplugin.dll"    -"c:\sys\bin\javacaptain_ext_storageserverplugin.dll"
 "\epoc32\release\armv5\urel\javacaptain_ext_btdeviceclassmanager.dll"   -"c:\sys\bin\javacaptain_ext_btdeviceclassmanager.dll"
+"\epoc32\release\armv5\urel\javacaptain_ext_autostarter.dll"            -"c:\sys\bin\javacaptain_ext_autostarter.dll"
 ; PLUGIN_ID_JAVA_CERT_STORE_EXTENSION_C = 7
 "\epoc32\release\armv5\urel\javacaptain_ext_ondemand_7.dll"             -"c:\sys\bin\javacaptain_ext_ondemand_7.dll"
 #ifdef RD_JAVA_MIDPRMS_DB
@@ -663,6 +665,7 @@
 "\epoc32\data\z\resource\plugins\LCDC64K.rsc"-"c:\resource\plugins\LCDC64K.rsc"
 "\epoc32\release\armv5\urel\lcdgdrv.dll"-"c:\sys\bin\lcdgdrv.dll"
 "\epoc32\release\armv5\urel\lcdgdrvi.dll"-"c:\sys\bin\lcdgdrvi.dll"
+"\epoc32\release\armv5\urel\lcduiphysicswrap.dll"-"c:\sys\bin\lcduiphysicswrap.dll"
 #ifdef RD_JAVA_S60_RELEASE_5_0_IAD
 "\epoc32\release\armv5\urel\midp2permissiondb.dll"-"c:\sys\bin\midp2permissiondb.dll"
 "\epoc32\release\armv5\urel\midp2userpreferences.dll"-"c:\sys\bin\midp2userpreferences.dll"

--- a/build/sis/java_3_1.pkg	Thu May 27 12:49:31 2010 +0300
+++ b/build/sis/java_3_1.pkg	Fri Jun 11 13:33:44 2010 +0300
@@ -55,7 +55,7 @@
 "\epoc32\data\z\resource\java\midpodclist"-"c:\resource\java\midpodclist"
 "\epoc32\data\z\resource\java\tckrunnerodclist"-"c:\resource\java\tckrunnerodclist"
 "\epoc32\data\z\resource\java\installerodclist"-"c:\resource\java\installerodclist"
-
+"\epoc32\data\z\resource\java\javacontrolpanelodclist"-"c:\resource\java\javacontrolpanelodclist"
 
 ; Dlls containing java byte code and their odc files
 "\epoc32\release\armv5\urel\javabluecove.dll"-"c:\sys\bin\javabluecove.dll"
@@ -158,12 +158,12 @@
 "\epoc32\release\armv5\urel\z\resource\java\jvm\lib\jrt\javawmamms.odc"-"c:\resource\java\jvm\lib\jrt\javawmamms.odc"
 
 "\epoc32\release\armv5\urel\z\resource\java\jvm\lib\jrt\tckrunner.odc"-"c:\resource\java\jvm\lib\jrt\tckrunner.odc"
+"\epoc32\release\armv5\urel\z\resource\java\jvm\lib\jrt\javacontrolpanel.odc"-"c:\resource\java\jvm\lib\jrt\javacontrolpanel.odc"
 
 
 
 ; Misc dlls
 
-"\epoc32\release\armv5\urel\ifeui.dll"-"c:\sys\bin\ifeui.dll"
 "\epoc32\release\armv5\urel\javaappschemeplugin.dll"-"c:\sys\bin\javaappschemeplugin.dll"
 "\epoc32\release\armv5\urel\javabtl2capscplugin.dll"-"c:\sys\bin\javabtl2capscplugin.dll"
 "\epoc32\release\armv5\urel\javabtsppscplugin.dll"-"c:\sys\bin\javabtsppscplugin.dll"
@@ -203,6 +203,7 @@
 "\epoc32\release\armv5\urel\javacaptain_ext_pushregistryplugin.dll"     -"c:\sys\bin\javacaptain_ext_pushregistryplugin.dll"
 "\epoc32\release\armv5\urel\javacaptain_ext_storageserverplugin.dll"    -"c:\sys\bin\javacaptain_ext_storageserverplugin.dll"
 "\epoc32\release\armv5\urel\javacaptain_ext_btdeviceclassmanager.dll"   -"c:\sys\bin\javacaptain_ext_btdeviceclassmanager.dll"
+"\epoc32\release\armv5\urel\javacaptain_ext_autostarter.dll"            -"c:\sys\bin\javacaptain_ext_autostarter.dll"
 ; PLUGIN_ID_JAVA_CERT_STORE_EXTENSION_C = 7
 "\epoc32\release\armv5\urel\javacaptain_ext_ondemand_7.dll"             -"c:\sys\bin\javacaptain_ext_ondemand_7.dll"
 #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
@@ -213,7 +214,6 @@
 #endif
 
 ; resources
-"\epoc32\data\z\resource\plugins\ifeui.rsc"                   -"c:\resource\plugins\ifeui.rsc"
 "\epoc32\data\z\resource\plugins\javaappschemeplugin.rsc"     -"c:\resource\plugins\javaappschemeplugin.rsc"
 "\epoc32\winscw\c\private\102033E6\installer\inst_plugins.cfg"-"c:\private\102033E6\installer\inst_plugins.cfg"
 "\epoc32\data\Z\Resource\versions\java.txt"-"c:\resource\versions\java.txt"
@@ -332,8 +332,8 @@
 ;"\epoc32\release\armv5\urel\javam3g.dll"-"c:\sys\bin\javam3g.dll"
 ;"\epoc32\release\armv5\urel\z\resource\java\jvm\lib\jrt\javam3g.odc"-"c:\resource\java\jvm\lib\jrt\javam3g.odc"
 
-;"\epoc32\release\armv5\urel\javanokiasound.dll"-"c:\sys\bin\javanokiasound.dll"
-;"\epoc32\release\armv5\urel\z\resource\java\jvm\lib\jrt\javanokiasound.odc"-"c:\resource\java\jvm\lib\jrt\javanokiasound.odc"
+"\epoc32\release\armv5\urel\javanokiasound.dll"-"c:\sys\bin\javanokiasound.dll"
+"\epoc32\release\armv5\urel\z\resource\java\jvm\lib\jrt\javanokiasound.odc"-"c:\resource\java\jvm\lib\jrt\javanokiasound.odc"
 
 ;"\epoc32\release\armv5\urel\javasoftnotification.dll"-"c:\sys\bin\javasoftnotification.dll"
 ;"\epoc32\release\armv5\urel\z\resource\java\jvm\lib\jrt\javasoftnotification.odc"-"c:\resource\java\jvm\lib\jrt\javasoftnotification.odc"

--- a/build/sis/java_rnd_tools.pkg	Thu May 27 12:49:31 2010 +0300
+++ b/build/sis/java_rnd_tools.pkg	Fri Jun 11 13:33:44 2010 +0300
@@ -31,10 +31,6 @@
 ;to be installed on Series 60 v5.0 platforms
 [0x1028315F], 0, 0, 0, {"Series60ProductID"}
 
-"\epoc32\release\armv5\urel\JavaCap.exe"-"c:\sys\bin\JavaCap.exe"
-"\epoc32\data\z\private\10003a3f\apps\JavaCap_reg.rsc"-"c:\private\10003a3f\import\apps\JavaCap_reg.rsc"
-"\epoc32\data\z\resource\apps\JavaCap.rsc"            -"c:\resource\apps\JavaCap.rsc"
-
 ;j9dmp23.dll is a J9 VM plugin that provides the thread dump utility.
 "\epoc32\release\armv5\urel\j9dmp23.dll"-"c:\sys\bin\j9dmp23.dll"
 ;javathreaddumper.dll provides the thread dump agent.
@@ -46,3 +42,8 @@
 
 ; javainstaller.exe is a command line tool for starting javainstaller for RnD purposes only
 "\epoc32\release\armv5\urel\javainstaller.exe"-"c:\sys\bin\javainst.exe"
+
+
+"\epoc32\release\armv5\urel\javacontrolpanel.dll"-"c:\sys\bin\javacontrolpanel.dll"
+"\epoc32\release\armv5\urel\javacontrolpanel.exe"-"c:\sys\bin\javacontrolpanel.exe"
+"\epoc32\data\z\private\10003a3f\apps\javacontrolpanel_reg.rsc" -"c:\private\10003a3f\import\apps\javacontrolpanel_reg.rsc"

--- a/build/symbian_uids.pri	Thu May 27 12:49:31 2010 +0300
+++ b/build/symbian_uids.pri	Fri Jun 11 13:33:44 2010 +0300
@@ -119,6 +119,9 @@
 contains(TARGET, javacaptain_ext_scrupdater): TARGET.UID3 = 0x2002DD10
 contains(TARGET, javacaptain_ext_ondemand_2): TARGET.UID3 = 0x2002DD01
 contains(TARGET, javanokiaui): TARGET.UID3 = 0x2002E697
+contains(TARGET, javacaptain_ext_autostarter): TARGET.UID3 = 0x2002EA7E
+contains(TARGET, javacontrolpanel): TARGET.UID3 = 0x2002FF62
+contains(TARGET, eswtqtwebkit): TARGET.UID3 = 0x2002FFA9
 
 isEmpty(TARGET.UID3): error($${TEMPLATE} $${TARGET} : UID3 not defined. Please allocate UID3 and configure it either on $${TARGET}.pro file or in command symbian_uids.pri)
 

--- a/inc/build_defines.hrh	Thu May 27 12:49:31 2010 +0300
+++ b/inc/build_defines.hrh	Fri Jun 11 13:33:44 2010 +0300
@@ -15,7 +15,7 @@
 *
 */
 
-#define RD_JAVA_VERSION 2,1,26 
+#define RD_JAVA_VERSION 2,2,1 
 #define RD_JAVA_SYMBIAN_TARGET 
 #define RD_JAVA_S60_RELEASE_10_1 
 #define RD_JAVA_S60_RELEASE_10_1_ONWARDS 
@@ -29,6 +29,7 @@
 #define SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK 
 #define RD_JAVA_USIF_APP_REG 
 #define RD_JAVA_USIF_NOTIFY_APP_ARC 
+#define RD_JAVA_USIF_NOTIFY_PROGRESS 
 #define RD_JAVA_PROXIMITY_LISTENER_ENABLED 
 #define RD_JAVA_OPENC_BETA_PATCH 
 #define OPENLCDUI_ENABLED 

--- a/inc/build_defines.pri	Thu May 27 12:49:31 2010 +0300
+++ b/inc/build_defines.pri	Fri Jun 11 13:33:44 2010 +0300
@@ -13,4 +13,4 @@
 #
 # Description: Generated file - do not edit manually
 #
-PROJECT_DEFINES *= RD_JAVA_SYMBIAN_TARGET RD_JAVA_S60_RELEASE_10_1 RD_JAVA_S60_RELEASE_10_1_ONWARDS RD_JAVA_S60_RELEASE_9_2_ONWARDS RD_JAVA_S60_RELEASE_5_0_ONWARDS RD_JAVA_UI_QT RD_JAVA_STDCPPV5 RD_JAVA_EPOCALLOWDLLDATA_FIX RD_JAVA_HTTP_EMC_ENABLED RD_JAVA_NGA_ENABLED SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK RD_JAVA_USIF_APP_REG RD_JAVA_USIF_NOTIFY_APP_ARC RD_JAVA_PROXIMITY_LISTENER_ENABLED RD_JAVA_OPENC_BETA_PATCH OPENLCDUI_ENABLED RD_JAVA_OPENLCDUI_ENABLED RD_JAVA_INSTALLERUI_ENABLED RD_JAVA_PREWARM RD_JAVA_ADVANCED_TACTILE_FEEDBACK RD_JAVA_APPLICATION_SETTINGS_QT RD_JAVA_MIDPRMS_DB 
+PROJECT_DEFINES *= RD_JAVA_SYMBIAN_TARGET RD_JAVA_S60_RELEASE_10_1 RD_JAVA_S60_RELEASE_10_1_ONWARDS RD_JAVA_S60_RELEASE_9_2_ONWARDS RD_JAVA_S60_RELEASE_5_0_ONWARDS RD_JAVA_UI_QT RD_JAVA_STDCPPV5 RD_JAVA_EPOCALLOWDLLDATA_FIX RD_JAVA_HTTP_EMC_ENABLED RD_JAVA_NGA_ENABLED SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK RD_JAVA_USIF_APP_REG RD_JAVA_USIF_NOTIFY_APP_ARC RD_JAVA_USIF_NOTIFY_PROGRESS RD_JAVA_PROXIMITY_LISTENER_ENABLED RD_JAVA_OPENC_BETA_PATCH OPENLCDUI_ENABLED RD_JAVA_OPENLCDUI_ENABLED RD_JAVA_INSTALLERUI_ENABLED RD_JAVA_PREWARM RD_JAVA_ADVANCED_TACTILE_FEEDBACK RD_JAVA_APPLICATION_SETTINGS_QT RD_JAVA_MIDPRMS_DB 

--- a/inc/java.txt	Thu May 27 12:49:31 2010 +0300
+++ b/inc/java.txt	Fri Jun 11 13:33:44 2010 +0300
@@ -1,1 +1,1 @@
-2.1.26
+2.2.1

--- a/inc/java_s60_release.hrh	Thu May 27 12:49:31 2010 +0300
+++ b/inc/java_s60_release.hrh	Fri Jun 11 13:33:44 2010 +0300
@@ -1,18 +1,1 @@
-/*
-* 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: 
-*
-*/
-
 RD_JAVA_S60_RELEASE=10.1

--- a/inc/project_defines.hrh	Thu May 27 12:49:31 2010 +0300
+++ b/inc/project_defines.hrh	Fri Jun 11 13:33:44 2010 +0300
@@ -28,6 +28,7 @@
 MACRO SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK 
 MACRO RD_JAVA_USIF_APP_REG 
 MACRO RD_JAVA_USIF_NOTIFY_APP_ARC 
+MACRO RD_JAVA_USIF_NOTIFY_PROGRESS 
 MACRO RD_JAVA_PROXIMITY_LISTENER_ENABLED 
 MACRO RD_JAVA_OPENC_BETA_PATCH 
 MACRO OPENLCDUI_ENABLED 

--- a/javacommons/comms/ipclib/clientserver/src.s60/commssession.cpp	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/comms/ipclib/clientserver/src.s60/commssession.cpp	Fri Jun 11 13:33:44 2010 +0300
@@ -87,7 +87,10 @@
         }
         else
         {
-            WLOG2(EJavaComms, "%s failed, err = %d", __PRETTY_FUNCTION__, rc);
+            if (rc != KErrOverflow)
+            {
+                WLOG2(EJavaComms, "%s failed, err = %d", __PRETTY_FUNCTION__, rc);
+            }
         }
     }
     return 0;
@@ -151,7 +154,10 @@
         }
         else
         {
-            WLOG2(EJavaComms, "%s failed, err = %d", __PRETTY_FUNCTION__, rc);
+            if (rc != KErrOverflow)
+            {
+                WLOG2(EJavaComms, "%s failed, err = %d", __PRETTY_FUNCTION__, rc);
+            }
         }
     }
 }
@@ -193,7 +199,7 @@
     else
     {
         rc = KErrOverflow;
-        WLOG3(EJavaComms, "%s: allocated length for message is too small (required size=%d, allocated size=%d)",
+        LOG3(EJavaComms, EInfo, "%s: allocated length for message is too small (required size=%d, allocated size=%d)",
               __PRETTY_FUNCTION__, neededLength, allocatedLength);
     }
 

--- a/javacommons/comms/ipclib/clientserver/src.s60/creceiver.cpp	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/comms/ipclib/clientserver/src.s60/creceiver.cpp	Fri Jun 11 13:33:44 2010 +0300
@@ -66,7 +66,7 @@
         // buffer was not big enough for the message so reallocate buffer with correct size
         mBuffer.Close();
         mBuffer.ReAllocL(mRequiredLength());
-        WLOG2(EJavaComms, "%s: increasing buffer size to %d", __PRETTY_FUNCTION__, mRequiredLength());
+        LOG2(EJavaComms, EInfo, "%s: increasing buffer size to %d", __PRETTY_FUNCTION__, mRequiredLength());
         Receive();
     }
     break;

--- a/javacommons/gcfprotocols/http/javasrc.s60/com/nokia/mj/impl/gcf/protocol/http/Protocol.java	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/gcfprotocols/http/javasrc.s60/com/nokia/mj/impl/gcf/protocol/http/Protocol.java	Fri Jun 11 13:33:44 2010 +0300
@@ -45,7 +45,7 @@
         String urls = null;
         int apnid = -1;
         int index = -1;
-        int responsetimeout = -1;
+        int responsetimeout = 180;  // default timeout of 3 minutes
         ConnectionManager cminstance = null;
         AccessPoint apn = null;
         iFullUrl = "http:" + aUri;

--- a/javacommons/gcfprotocols/http/src.s60/chttptransactionclient.cpp	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/gcfprotocols/http/src.s60/chttptransactionclient.cpp	Fri Jun 11 13:33:44 2010 +0300
@@ -626,6 +626,14 @@
             iStatus = CHttpTransactionClient::ERequestNextBodayData;
             break;
         }
+        
+        case THTTPEvent::EReceiveTimeOut:
+        {
+        	  ELOG(ESOCKET,"MHFRunL EReceiveTimeOut");
+        	  NotifyErrorL(KErrTimedOut);  // send timeout error to java
+        	  break;
+        	
+        }        
         /*
         * -j2me expects the http stack to be able to post body data with no content type
         *   the native stack default validation filter does not allow this.
@@ -694,7 +702,6 @@
         iTransaction.Cancel();
         iHttpSession.RestartConnection();
 
-
     }
     if (iJavaWaitingOnCallBack)
     {
@@ -707,7 +714,7 @@
         LOG(ESOCKET,EInfo,"Notifiy Read EOF / Cancel");
         iJavaWaitingOnCallBack=EFalse;
         //Notify Java of error if it is waiting for a read
-        iObserver->DataReadyForRead(-1);
+        iObserver->DataReadyForRead(aErrorCode);
     }
 
 }

--- a/javacommons/gcfprotocols/socket/socket/inc/apnsettings.h	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/gcfprotocols/socket/socket/inc/apnsettings.h	Fri Jun 11 13:33:44 2010 +0300
@@ -27,7 +27,7 @@
 
 public :
     static int setDefaultApn(int aType, int aApn);
-    static void removeDefaultApn();
+   
 };
 
 

--- a/javacommons/gcfprotocols/socket/socket/src.s60/apnsettings.cpp	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/gcfprotocols/socket/socket/src.s60/apnsettings.cpp	Fri Jun 11 13:33:44 2010 +0300
@@ -66,11 +66,4 @@
     return def;
 }
 
-void ApnSettings::removeDefaultApn()
-{ 
-    #ifdef RD_JAVA_OPENC_BETA_PATCH
-        setdefaultif(NULL);
-        ILOG(ESOCKET, "sedefaultif called");
-        ILOG1(ESOCKET, "remove default apn returned %d",setdefaultif(NULL));
-    #endif  
-}
+

--- a/javacommons/jvms/cldc_1.1.1/javasrc/java/util/Timer.java	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/jvms/cldc_1.1.1/javasrc/java/util/Timer.java	Fri Jun 11 13:33:44 2010 +0300
@@ -1,19 +1,3 @@
-/*
-* 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: 
-*
-*/
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one or more
  *  contributor license agreements.  See the NOTICE file distributed with

--- a/javacommons/jvms/cldc_1.1.1/javasrc/java/util/TimerTask.java	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/jvms/cldc_1.1.1/javasrc/java/util/TimerTask.java	Fri Jun 11 13:33:44 2010 +0300
@@ -1,19 +1,3 @@
-/*
-* 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: 
-*
-*/
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one or more
  *  contributor license agreements.  See the NOTICE file distributed with

--- a/javacommons/jvms/cldc_1.1.1/tsrc/javasrc/com/nokia/mj/test/java/util/TimerTaskTest.java	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/jvms/cldc_1.1.1/tsrc/javasrc/com/nokia/mj/test/java/util/TimerTaskTest.java	Fri Jun 11 13:33:44 2010 +0300
@@ -1,19 +1,3 @@
-/*
-* 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: 
-*
-*/
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one or more
  *  contributor license agreements.  See the NOTICE file distributed with

--- a/javacommons/jvms/cldc_1.1.1/tsrc/javasrc/com/nokia/mj/test/java/util/TimerTest.java	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/jvms/cldc_1.1.1/tsrc/javasrc/com/nokia/mj/test/java/util/TimerTest.java	Fri Jun 11 13:33:44 2010 +0300
@@ -1,19 +1,3 @@
-/*
-* 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: 
-*
-*/
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one or more
  *  contributor license agreements.  See the NOTICE file distributed with

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javacommons/jvms/j9/exports.inf	Fri Jun 11 13:33:44 2010 +0300
@@ -0,0 +1,23 @@
+/*
+* Copyright (c) 2010 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: 
+*
+*/
+
+PRJ_PLATFORMS
+default
+
+#ifndef RD_JAVA_SF_BUILD
+#include "s60/exports.inf"
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javacommons/jvms/j9/j9.pro	Fri Jun 11 13:33:44 2010 +0300
@@ -0,0 +1,23 @@
+#
+# Copyright (c) 2010 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: 
+#
+
+TEMPLATE = subdirs
+
+# Export J9 only when available here (not available here in SF builds)
+# (use indirection through ./exports.inf for pregenerated bld.inf variation)
+exists($${_PRO_FILE_PWD_}/s60/exports.inf): {
+  BLD_INF_RULES.prj_extensions += "$${LITERAL_HASH}include \"exports.inf\"" \
+}

--- a/javacommons/security/build/exports.inf	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/build/exports.inf	Fri Jun 11 13:33:44 2010 +0300
@@ -27,9 +27,12 @@
 
 #include <platform_paths.hrh>
 
+// Configuration interface for javasecurity
 #ifdef RD_JAVA_S60_RELEASE_10_1_ONWARDS 
+// Public configuration interface is named as CI_javasecurity.confml
+// and it is located outside of jrt package. The name of private
+// configuration interface is javasecurity2.confml.
 ../conf/javasecurity2.confml        APP_LAYER_CONFML(javasecurity.confml)
-../conf/CI_javasecurity.confml      APP_LAYER_CONFML(CI_javasecurity.confml)
 #else
 ../conf/javasecurity.confml         APP_LAYER_CONFML(javasecurity.confml)
 #endif /* RD_JAVA_S60_RELEASE_10_1_ONWARDS */

Binary file javacommons/security/conf/CI_javasecurity.confml has changed

--- a/javacommons/security/data/att_manufacturer.txt	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/data/att_manufacturer.txt	Fri Jun 11 13:33:44 2010 +0300
@@ -30,6 +30,7 @@
     permission javax.microedition.media.control.VideoControl.getSnapshot "*" "snapshot";
     permission javax.microedition.io.Connector.rtsp "*";
     permission javax.microedition.PropertyPermission "mobinfo.imsi" "read";
+    permission javax.microedition.midlet.CmdLineArgsPermission;
 }
 
 grant assigned {

--- a/javacommons/security/data/att_operator.txt	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/data/att_operator.txt	Fri Jun 11 13:33:44 2010 +0300
@@ -48,8 +48,16 @@
     permission javax.microedition.io.PushRegistryPermission "*" "staticregistration,dynamicregistration,autoinvocation";
 }
 
+grant user "Url start" blanket,session,oneshot,no {
+    permission javax.microedition.midlet.CmdLineArgsPermission;
+}
+
 grant allowed {
     permission javax.microedition.io.Connector.sms "sms://*" "open,receive";
     permission javax.microedition.io.Connector.mms "mms://*" "open,receive";
     permission javax.microedition.io.Connector.cbs "cbs://*" "open,receive";
 }
+
+grant assigned {
+    permission javax.microedition.midlet.AutoStartPermission;
+}

--- a/javacommons/security/data/att_operatorextra.txt	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/data/att_operatorextra.txt	Fri Jun 11 13:33:44 2010 +0300
@@ -30,6 +30,7 @@
     permission javax.microedition.media.control.VideoControl.getSnapshot "*" "snapshot";
     permission javax.microedition.io.Connector.rtsp "*";
     permission javax.microedition.PropertyPermission "mobinfo.imsi" "read";
+    permission javax.microedition.midlet.CmdLineArgsPermission;
 }
 
 grant assigned {

--- a/javacommons/security/data/msa_manufacturer.txt	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/data/msa_manufacturer.txt	Fri Jun 11 13:33:44 2010 +0300
@@ -30,6 +30,7 @@
     permission javax.microedition.media.control.VideoControl.getSnapshot "*" "snapshot";
     permission javax.microedition.io.Connector.rtsp "*";
     permission javax.microedition.PropertyPermission "mobinfo.imsi" "read";
+    permission javax.microedition.midlet.CmdLineArgsPermission;
 }
 
 grant assigned {

--- a/javacommons/security/data/msa_operator.txt	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/data/msa_operator.txt	Fri Jun 11 13:33:44 2010 +0300
@@ -30,6 +30,7 @@
     permission javax.microedition.media.control.VideoControl.getSnapshot "*" "snapshot";
     permission javax.microedition.io.Connector.rtsp "*";
     permission javax.microedition.PropertyPermission "mobinfo.imsi" "read";
+    permission javax.microedition.midlet.CmdLineArgsPermission;
 }
 
 grant assigned {

--- a/javacommons/security/data/msa_trustedthirdparty.txt	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/data/msa_trustedthirdparty.txt	Fri Jun 11 13:33:44 2010 +0300
@@ -62,6 +62,10 @@
     permission javax.microedition.apdu.aid "apdu://*" "aid";
 }
 
+grant user "Url start" session,oneshot,no {
+    permission javax.microedition.midlet.CmdLineArgsPermission;
+}
+
 grant allowed {
     permission javax.microedition.io.Connector.sms "sms://*" "open,receive";
     permission javax.microedition.io.Connector.mms "mms://*" "open,receive";

--- a/javacommons/security/data/s60_manufacturer.txt	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/data/s60_manufacturer.txt	Fri Jun 11 13:33:44 2010 +0300
@@ -30,6 +30,7 @@
     permission javax.microedition.media.control.VideoControl.getSnapshot "*" "snapshot";
     permission javax.microedition.io.Connector.rtsp "*";
     permission javax.microedition.PropertyPermission "mobinfo.imsi" "read";
+    permission javax.microedition.midlet.CmdLineArgsPermission;
 }
 
 grant assigned {

--- a/javacommons/security/data/s60_operator.txt	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/data/s60_operator.txt	Fri Jun 11 13:33:44 2010 +0300
@@ -30,6 +30,7 @@
     permission javax.microedition.media.control.VideoControl.getSnapshot "*" "snapshot";
     permission javax.microedition.io.Connector.rtsp "*";
     permission javax.microedition.PropertyPermission "mobinfo.imsi" "read";
+    permission javax.microedition.midlet.CmdLineArgsPermission;
 }
 
 grant assigned {

--- a/javacommons/security/data/s60_trustedthirdparty.txt	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/data/s60_trustedthirdparty.txt	Fri Jun 11 13:33:44 2010 +0300
@@ -63,6 +63,10 @@
     permission javax.microedition.securityservice.CMSMessageSignatureService "pki://*" "authenticate";
 }
 
+grant user "Url start" session,oneshot,no {
+    permission javax.microedition.midlet.CmdLineArgsPermission;
+}
+
 grant allowed {
     permission javax.microedition.io.Connector.sms "sms://*" "open,receive";
     permission javax.microedition.io.Connector.mms "mms://*" "open,receive";

--- a/javacommons/security/inc/securitystoragedatadefs.h	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/inc/securitystoragedatadefs.h	Fri Jun 11 13:33:44 2010 +0300
@@ -42,6 +42,7 @@
 const wchar_t* const AUTHENTICATION_SETTINGS = L"Authentication";
 const wchar_t* const BROADCAST_SETTINGS = L"Broadcast";
 const wchar_t* const NFC_WRITE_ACCESS_SETTINGS = L"NFC Write Access";
+const wchar_t* const URL_START_SETTINGS = L"Url start";
 
 // interaction modes values
 const wchar_t* const ONESHOT_INTERACTION_MODE = L"1";

--- a/javacommons/security/javasrc/com/nokia/mj/impl/security/common/Certificate.java	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/javasrc/com/nokia/mj/impl/security/common/Certificate.java	Fri Jun 11 13:33:44 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 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"
@@ -318,8 +318,9 @@
             {
                 Calendar cal = Calendar.getInstance();
                 cal.set(Calendar.YEAR, Integer.parseInt(str.substring(0,4)));
-                cal.set(Calendar.MONTH, Integer.parseInt(str.substring(4,6)));
-                cal.set(Calendar.DAY_OF_WEEK, Integer.parseInt(str.substring(6,8)));
+                // Calendar.MONTH begins from 0 (0=January, 1=Februrary, ...)
+                cal.set(Calendar.MONTH, Integer.parseInt(str.substring(4,6)) - 1);
+                cal.set(Calendar.DAY_OF_MONTH, Integer.parseInt(str.substring(6,8)));
                 cal.set(Calendar.HOUR, Integer.parseInt(str.substring(8,10)));
                 cal.set(Calendar.MINUTE, Integer.parseInt(str.substring(10,12)));
                 cal.set(Calendar.SECOND, Integer.parseInt(str.substring(12,14)));

--- a/javacommons/security/javasrc/com/nokia/mj/impl/security/midp/authorization/AccessControllerFactoryImpl.java	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/javasrc/com/nokia/mj/impl/security/midp/authorization/AccessControllerFactoryImpl.java	Fri Jun 11 13:33:44 2010 +0300
@@ -61,7 +61,7 @@
      *                        which the AccessControllerImpl instance
      *                        is retrieved
      */
-    public static AccessControllerImpl getAccessController(StorageSession aStorageSession,
+    public synchronized static AccessControllerImpl getAccessController(StorageSession aStorageSession,
             Uid aAppSuiteUid,
             String aAppName)
     {
@@ -69,7 +69,6 @@
         {
             return null;
         }
-        // Synchronization missing
         AccessControllerImpl instance = (AccessControllerImpl)instances.get(
                                             aAppSuiteUid);
 
@@ -82,14 +81,13 @@
         return instance;
     }
 
-    public static void destroyAccessController(Uid appUID)
+    public synchronized static void destroyAccessController(Uid appUID)
     {
         if (appUID == null)
         {
             return;
         }
         // This is to be called when a MIDlet suite is stoped
-        // Synchronization missing
         // Remove the instance or mark it as inactive?
         AccessControllerImpl ac = (AccessControllerImpl)instances
                                   .remove(appUID);

--- a/javacommons/security/javasrc/com/nokia/mj/impl/security/midp/authorization/SecurityPromptHandler.java	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/javasrc/com/nokia/mj/impl/security/midp/authorization/SecurityPromptHandler.java	Fri Jun 11 13:33:44 2010 +0300
@@ -81,7 +81,7 @@
         }
     }
 
-    public UserSecuritySettings handleUserPermission(
+    public synchronized UserSecuritySettings handleUserPermission(
         UserPermission userPermission, boolean blanketPromptShown)
     {
         UserSecuritySettings settings = userPermission
@@ -219,7 +219,7 @@
             }
             else
             {
-                RuntimeUi ui = getUiInstance();
+                getUiInstance();
                 boolean responseAvailable = ui.confirm(
                                                 appName,
                                                 cData);
@@ -329,13 +329,12 @@
         }
     }
 
-    private RuntimeUi getUiInstance()
+    private void getUiInstance()
     {
         if (ui == null)
         {
             ui = RuntimeUiFactory.getRuntimeUi();
         }
-        return ui;
     }
 
     private UserSecuritySettings handleDenyAnswer(UserSecuritySettings settings)

--- a/javacommons/security/javasrc/com/nokia/mj/impl/security/midp/common/PermissionMappingTable.java	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/javasrc/com/nokia/mj/impl/security/midp/common/PermissionMappingTable.java	Fri Jun 11 13:33:44 2010 +0300
@@ -228,6 +228,12 @@
        PERMISSION_MAPPING_TABLE.put(
             "javax.microedition.midlet.AutoStartPermission", new MIDPPermission(
                 "com.nokia.mj.impl.installer.utils.AutoStartPermission", null));
+       PERMISSION_MAPPING_TABLE.put(
+            "javax.microedition.midlet.CmdLineArgsPermission", new MIDPPermission(
+                "com.nokia.mj.impl.rt.utils.CmdLineArgsPermission", null));
+       PERMISSION_MAPPING_TABLE.put(
+            "com.nokia.webstart", new MIDPPermission(
+                "com.nokia.mj.impl.rt.utils.CmdLineArgsPermission", null));
     }
 
     /**

--- a/javacommons/security/javasrc/com/nokia/mj/impl/security/midp/common/UserSecuritySettings.java	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/javasrc/com/nokia/mj/impl/security/midp/common/UserSecuritySettings.java	Fri Jun 11 13:33:44 2010 +0300
@@ -48,6 +48,7 @@
     public static final String AUTHENTICATION_SETTINGS = "Authentication";
     public static final String BROADCAST_SETTINGS = "Broadcast";
     public static final String NFC_WRITE_ACCESS_SETTINGS = "NFC Write Access";
+    public static final String URL_START_SETTINGS = "Url start";
 
     // security warnings modes
     public static final String SECURITY_WARNINGS_USER_DEFINED_MODE = "1";

--- a/javacommons/security/javasrc/com/nokia/mj/impl/security/midp/common/UserSecuritySettingsImpl.java	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/javasrc/com/nokia/mj/impl/security/midp/common/UserSecuritySettingsImpl.java	Fri Jun 11 13:33:44 2010 +0300
@@ -51,6 +51,7 @@
     private static final String AUTHENTICATION_ID = "setting_auth";
     private static final String BROADCAST_ID = "setting_broadcast";
     private static final String NFC_WRITE_ACCESS_ID = "setting_nfc_write_access";
+    private static final String URL_START_ID = "setting_url_start";
 
     public UserSecuritySettingsImpl(
         String name,
@@ -159,6 +160,10 @@
         {
             id = BROADCAST_ID;
         }
+        else if (URL_START_SETTINGS.equalsIgnoreCase(aSettingName))
+        {
+            id = URL_START_ID;
+        }
         return resLoader.format(id, null /*aTextParameters*/);
     }
 

--- a/javacommons/security/javasrc/com/nokia/mj/impl/security/utils/SecurityPromptMessage.java	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/javasrc/com/nokia/mj/impl/security/utils/SecurityPromptMessage.java	Fri Jun 11 13:33:44 2010 +0300
@@ -79,6 +79,7 @@
     public static final String QUESTION_ID_PUSH_DYNAMIC_REGISTRATION = "push_registration_dynamic";
     public static final String QUESTION_ID_AUTO_INVOCATION = "auto_invocation";
     public static final String QUESTION_ID_NDEF_TAG_WRITE = "nfc_ndef_tag_write";
+    public static final String QUESTION_ID_APP_AUTO_LAUNCH = "url_start";
 
     // identifiers for the security prompt answer options
     public static final String ANSWER_ID_ALLOW = "prompt_allow";

--- a/javacommons/security/javaunicertstoreplugin/src.s60/javacertstoreimpl.cpp	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/javaunicertstoreplugin/src.s60/javacertstoreimpl.cpp	Fri Jun 11 13:33:44 2010 +0300
@@ -75,7 +75,6 @@
         Cancel();
     }
 
-    mComms.unregisterListener(PLUGIN_ID_JAVA_CERT_STORE_ECOM_C,this);
     mComms.unregisterDefaultListener(this);
     mComms.disconnect();
     mCertsData.ResetAndDestroy();
@@ -388,7 +387,7 @@
     TBool validRequest = validateCertAttrFilter(aFilter);
     if (!validRequest)
     {
-        ELOG(EJavaSecurity,"No certificates matching the filter supplied");
+        LOG(EJavaSecurity, EInfo, "No certificates matching the filter supplied");
         User::RequestComplete(pRequestStatus,KErrNone);
         return;
     }

--- a/javacommons/security/javaunicertstoreplugin/src.s60/javacertstoreimpl.h	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/javaunicertstoreplugin/src.s60/javacertstoreimpl.h	Fri Jun 11 13:33:44 2010 +0300
@@ -68,8 +68,7 @@
 };
 
 class CJavaCertStoreImpl: public CActive, public MCTWritableCertStore,
-        public java::comms::CommsListener,
-        public java::comms::CommsClientEndpoint
+        public java::comms::CommsListener
 {
 public:
 

--- a/javacommons/security/tsrc/data/policies/test_manufacturer.txt	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/tsrc/data/policies/test_manufacturer.txt	Fri Jun 11 13:33:44 2010 +0300
@@ -30,6 +30,7 @@
     permission javax.microedition.media.control.VideoControl.getSnapshot "*" "snapshot";
     permission javax.microedition.io.Connector.rtsp "*";
     permission javax.microedition.PropertyPermission "mobinfo.imsi" "read";
+    permission javax.microedition.midlet.CmdLineArgsPermission;
 }
 grant assigned {
     permission javax.microedition.PropertyPermission "mobinfo.msisdn" "read";

--- a/javacommons/security/tsrc/data/policies/test_operator.txt	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/tsrc/data/policies/test_operator.txt	Fri Jun 11 13:33:44 2010 +0300
@@ -30,6 +30,7 @@
     permission javax.microedition.media.control.VideoControl.getSnapshot "*" "snapshot";
     permission javax.microedition.io.Connector.rtsp "*";
     permission javax.microedition.PropertyPermission "mobinfo.imsi" "read";
+    permission javax.microedition.midlet.CmdLineArgsPermission;
 }
 grant assigned {
     permission javax.microedition.PropertyPermission "mobinfo.msisdn" "read";

--- a/javacommons/security/tsrc/data/policies/test_operatorextra.txt	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/tsrc/data/policies/test_operatorextra.txt	Fri Jun 11 13:33:44 2010 +0300
@@ -29,4 +29,5 @@
     permission javax.microedition.media.control.RecordControl "*" "record";
     permission javax.microedition.media.control.VideoControl.getSnapshot "*" "snapshot";
     permission javax.microedition.io.Connector.rtsp "*";
+    permission javax.microedition.midlet.CmdLineArgsPermission;
 }

--- a/javacommons/security/tsrc/data/policies/test_trustedthirdparty.txt	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/tsrc/data/policies/test_trustedthirdparty.txt	Fri Jun 11 13:33:44 2010 +0300
@@ -63,6 +63,10 @@
     permission javax.microedition.securityservice.CMSMessageSignatureService "pki://*" "authenticate";
 }
 
+grant user "Url start" session,oneshot,no {
+    permission javax.microedition.midlet.CmdLineArgsPermission;
+}
+
 grant allowed {
     permission javax.microedition.io.Connector.sms "sms://*" "open,receive";
     permission javax.microedition.io.Connector.mms "mms://*" "open,receive";

--- a/javacommons/security/tsrc/javasrc/com/nokia/mj/impl/security/midp/authorization/SecurityPolicyModuleTests.java	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/security/tsrc/javasrc/com/nokia/mj/impl/security/midp/authorization/SecurityPolicyModuleTests.java	Fri Jun 11 13:33:44 2010 +0300
@@ -89,6 +89,7 @@
         new SecurityPolicyPermission(getPermissionName("javax.microedition.PropertyPermission"),"mobinfo.publicinfo","read",null),
         new SecurityPolicyPermission(getPermissionName("javax.microedition.PropertyPermission"),"mobinfo.cellid","read",null),
         new SecurityPolicyPermission(getPermissionName("javax.microedition.midlet.AutoStartPermission"),null,null,null),
+        new SecurityPolicyPermission(getPermissionName("javax.microedition.midlet.CmdLineArgsPermission"),null,null,null),
     };
     static final SecurityPolicyPermission[] OPERATOR_PERMS =
     {
@@ -142,6 +143,7 @@
         new SecurityPolicyPermission(getPermissionName("javax.microedition.PropertyPermission"),"mobinfo.publicinfo","read",null),
         new SecurityPolicyPermission(getPermissionName("javax.microedition.PropertyPermission"),"mobinfo.cellid","read",null),
         new SecurityPolicyPermission(getPermissionName("javax.microedition.midlet.AutoStartPermission"),null,null,null),
+        new SecurityPolicyPermission(getPermissionName("javax.microedition.midlet.CmdLineArgsPermission"),null,null,null),
     };
     static final SecurityPolicyPermission[] IDENTIFIED_THIRD_PARTY_PERMS =
     {
@@ -265,6 +267,9 @@
                                                                           new int[]{UserSecuritySettings.BLANKET_INTERACTION_MODE,UserSecuritySettings.ONESHOT_INTERACTION_MODE,UserSecuritySettings.NO_INTERACTION_MODE,UserSecuritySettings.SESSION_INTERACTION_MODE})),
         new SecurityPolicyPermission(getPermissionName("javax.microedition.PropertyPermission"),"mobinfo.publicinfo","read",null),
         new SecurityPolicyPermission(getPermissionName("javax.microedition.PropertyPermission"),"mobinfo.cellid","read",null),
+        new SecurityPolicyPermission(getPermissionName("javax.microedition.midlet.CmdLineArgsPermission"),null, null,
+                                     new SecurityPolicyPermissionSettings("Url start",UserSecuritySettings.SESSION_INTERACTION_MODE,
+                                                                          new int[]{UserSecuritySettings.ONESHOT_INTERACTION_MODE,UserSecuritySettings.NO_INTERACTION_MODE,UserSecuritySettings.SESSION_INTERACTION_MODE})),
     };
     static final SecurityPolicyPermission[] UNIDENTIFIED_THIRD_PARTY_PERMS =
     {

--- a/javacommons/utils/inc/javaoslayer.h	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/utils/inc/javaoslayer.h	Fri Jun 11 13:33:44 2010 +0300
@@ -33,6 +33,7 @@
 const int BOOT_CLASSPATH_MIDP = 1;
 const int BOOT_CLASSPATH_INSTALLER = 2;
 const int BOOT_CLASSPATH_TCKRUNNER = 3;
+const int BOOT_CLASSPATH_JAVACONTROLPANEL = 4;
 
 class DriveId;
 

--- a/javacommons/utils/src.s60/javaoslayer.cpp	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/utils/src.s60/javaoslayer.cpp	Fri Jun 11 13:33:44 2010 +0300
@@ -39,6 +39,7 @@
 const char * const BOOT_CLASSPATH_MIDP_FILE = "midpodclist";
 const char * const BOOT_CLASSPATH_INSTALLER_FILE = "installerodclist";
 const char * const BOOT_CLASSPATH_TCKRUNNER_FILE = "tckrunnerodclist";
+const char * const BOOT_CLASSPATH_JAVACONTROLPANEL_FILE = "javacontrolpanelodclist";
 
 _LIT(KStartUpTraceDir, "java\\full");
 _LIT(KStartUpTraceFile, "startup.txt");
@@ -303,6 +304,10 @@
     {
         path.append(BOOT_CLASSPATH_TCKRUNNER_FILE);
     }
+    else if (BOOT_CLASSPATH_JAVACONTROLPANEL == pathType)
+    {
+        path.append(BOOT_CLASSPATH_JAVACONTROLPANEL_FILE);
+    }
     else
     {
         path.append(BOOT_CLASSPATH_MIDP_FILE);

--- a/javacommons/utils/src.s60/s60commonutils.cpp	Thu May 27 12:49:31 2010 +0300
+++ b/javacommons/utils/src.s60/s60commonutils.cpp	Fri Jun 11 13:33:44 2010 +0300
@@ -118,6 +118,12 @@
 
     for (int i = 0; i< count; i++)
     {
+         if( !aNativeArray[ i ] )
+         {
+             // Skip null elements since already initialized
+             continue;
+         }
+    	
         //TPtr16 temp =  aNativeArray[i]->Des();
         jstring javaString = S60CommonUtils::NativeToJavaString(aJni, *aNativeArray[i]);
         if (javaString == NULL)

--- a/javaextensions/sensor/src.s60/cacceleratorsensor.cpp	Thu May 27 12:49:31 2010 +0300
+++ b/javaextensions/sensor/src.s60/cacceleratorsensor.cpp	Fri Jun 11 13:33:44 2010 +0300
@@ -297,7 +297,6 @@
 
 void CAcceleratorSensor::OpenChannelL()
 {
-    TInt err;
     JELOG2(ESensor);
     LOG(ESensor,EInfo,"Creating Open Channel");
     iChannel->OpenChannelL();
@@ -306,9 +305,9 @@
     iScaleFactor = 1;
     TInt format(ESensrvChannelDataFormatAbsolute);
     TSensrvProperty property;
-    TRAP(err,iChannel->GetPropertyL(KSensrvPropIdChannelDataFormat, KSensrvItemIndexNone,
-                                      property););
-    LOG1(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::GetPropertyL() One = %d",err);
+    iChannel->GetPropertyL(KSensrvPropIdChannelDataFormat, KSensrvItemIndexNone,
+                                      property);
+    
 
     if (property.PropertyType() == ESensrvIntProperty)
     {
@@ -328,19 +327,17 @@
         // Scaled value maximum
         TSensrvProperty property_scaled;
         TInt maxScaled(0);
-        TRAP(err,iChannel->GetPropertyL(KSensrvPropIdScaledRange, KSensrvItemIndexNone,
-                                          property_scaled););
-        LOG1(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::GetPropertyL() Two = %d",err);
+       iChannel->GetPropertyL(KSensrvPropIdScaledRange, KSensrvItemIndexNone,
+                                          property_scaled);
+        
 
         if (property_scaled.GetArrayIndex() == ESensrvArrayPropertyInfo)
         {
             LOG(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::If");
             //for 2G Accelerometer Sensor index value is 0.
             TInt rangeIndex(0);
-            TRAP(err,iChannel->GetPropertyL(KSensrvPropIdScaledRange, KSensrvItemIndexNone,
-                                              rangeIndex, property_scaled););
-            LOG1(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::GetPropertyL() Three = %d",err);
-
+            iChannel->GetPropertyL(KSensrvPropIdScaledRange, KSensrvItemIndexNone,
+                                              rangeIndex, property_scaled);
             property_scaled.GetMaxValue(maxScaled);
 
             LOG1(ESensor,EInfo,"property_scaled::maxValue = %d",maxScaled);
@@ -353,36 +350,32 @@
         }
         // MeasureRange can be an array property
         TReal maxMeasure;
-        TInt err1;
+        
         TSensrvProperty property_Measured;
-        TRAP(err1,iChannel->GetPropertyL(KSensrvPropIdMeasureRange, KSensrvItemIndexNone,
-                                          property_Measured););
-        LOG1(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::GetPropertyL() Four = %d",err1);
+        iChannel->GetPropertyL(KSensrvPropIdMeasureRange, KSensrvItemIndexNone,
+                                          property_Measured);
+             
+        TInt arrayIndex = property_Measured.GetArrayIndex();
+        LOG1(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::KSensrvPropIdMeasureRange::arrayIndex = %d",arrayIndex);
 
-        if (err1 == KErrNone)
+        if (property_Measured.GetArrayIndex() == ESensrvArrayPropertyInfo)
         {
-            TInt arrayIndex = property_Measured.GetArrayIndex();
-            LOG1(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::KSensrvPropIdMeasureRange::arrayIndex = %d",arrayIndex);
-
-            if (property_Measured.GetArrayIndex() == ESensrvArrayPropertyInfo)
-            {
-                LOG(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::If");
+            LOG(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::If");
 
-                TInt index2g = 0;
-                LOG1(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::Getting RangeIndex = %f",index2g);
-                //We need to TypeCast variable rangeIndex to TInt for
-                TRAP(err,iChannel->GetPropertyL(KSensrvPropIdMeasureRange, KSensrvItemIndexNone,
-                                                  index2g, property_Measured););
-                LOG1(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::GetPropertyL() Five = %d",err);
-                property_Measured.GetMaxValue(maxMeasure);
-            }
-            else
-            {
-                LOG(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::else");
-                property_Measured.GetMaxValue(maxMeasure);
-            }
+            TInt index2g = 0;
+            LOG1(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::Getting RangeIndex = %f",index2g);
+            //We need to TypeCast variable rangeIndex to TInt for
+            iChannel->GetPropertyL(KSensrvPropIdMeasureRange, KSensrvItemIndexNone,
+                                              index2g, property_Measured);
+            property_Measured.GetMaxValue(maxMeasure);
+        }
+        else
+        {
+            LOG(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::else");
+            property_Measured.GetMaxValue(maxMeasure);
+        }
 
-        }
+        
         iScaleFactor = maxMeasure / maxScaled ;
         LOG1(ESensor,EInfo,"CAcceleratorSensor::OpenChannelL()::iScaleFactor = %f",iScaleFactor);
     }

--- a/javaextensions/wma/mms/pushplugin/build/eabi/javammsscpluginu.def	Thu May 27 12:49:31 2010 +0300
+++ b/javaextensions/wma/mms/pushplugin/build/eabi/javammsscpluginu.def	Fri Jun 11 13:33:44 2010 +0300
@@ -24,4 +24,6 @@
 	_ZThn28_N4java3wma22S60MmsServerConnection9setFilterERKSbIwSt11char_traitsIwESaIwEE @ 23 NONAME ; #<thunk>#
 	_ZThn28_NK4java3wma22S60MmsServerConnection6getUriEv @ 24 NONAME ; #<thunk>#
 	_ZThn28_NK4java3wma22S60MmsServerConnection9getFilterEv @ 25 NONAME ; #<thunk>#
+	_ZN4java3wma22S60MmsServerConnection5closeEv @ 26 NONAME
+	_ZThn28_N4java3wma22S60MmsServerConnection5closeEv @ 27 NONAME
 

--- a/javaextensions/wma/mms/pushplugin/src.s60/s60mmsserverconnection.cpp	Thu May 27 12:49:31 2010 +0300
+++ b/javaextensions/wma/mms/pushplugin/src.s60/s60mmsserverconnection.cpp	Fri Jun 11 13:33:44 2010 +0300
@@ -270,7 +270,7 @@
     return mFilter;
 }
 
-void S60MmsServerConnection::close()
+OS_EXPORT void S60MmsServerConnection::close()
 {
     JELOG2(EWMA);
     // the close and RunL are synchronized to make it SMP safe.

--- a/javaextensions/wma/sms_cbs/pushplugin/cbs/build/eabi/javacbsscpluginu.def	Thu May 27 12:49:31 2010 +0300
+++ b/javaextensions/wma/sms_cbs/pushplugin/cbs/build/eabi/javacbsscpluginu.def	Fri Jun 11 13:33:44 2010 +0300
@@ -24,4 +24,16 @@
 	_ZTVN4java3wma19CbsServerConnectionE @ 23 NONAME ; #<VT>#
 	_ZTVN4java3wma20ServerConnectionBaseE @ 24 NONAME ; #<VT>#
 	_ZThn28_N4java3wma19CbsServerConnection4openEPNS_4push18ConnectionListenerE @ 25 NONAME ; #<thunk>#
+	_ZN4java3wma19CbsServerConnection15retrieveMessageER8TPckgBufI22TJavaMessageParametersE @ 26 NONAME
+	_ZN4java3wma19CbsServerConnection4openEPNS_4push18ConnectionListenerEb @ 27 NONAME
+	_ZN4java3wma19CbsServerConnection5closeEv @ 28 NONAME
+	_ZN4java3wma19CbsServerConnectionD0Ev @ 29 NONAME
+	_ZN4java3wma19CbsServerConnectionD1Ev @ 30 NONAME
+	_ZN4java3wma19CbsServerConnectionD2Ev @ 31 NONAME
+	_ZThn28_N4java3wma19CbsServerConnection15retrieveMessageER8TPckgBufI22TJavaMessageParametersE @ 32 NONAME
+	_ZThn28_N4java3wma19CbsServerConnection4openEPNS_4push18ConnectionListenerEb @ 33 NONAME
+	_ZThn28_N4java3wma19CbsServerConnection5closeEv @ 34 NONAME
+	_ZThn28_N4java3wma19CbsServerConnectionD0Ev @ 35 NONAME
+	_ZThn28_N4java3wma19CbsServerConnectionD1Ev @ 36 NONAME
 
+

--- a/javaextensions/wma/sms_cbs/pushplugin/cbs/src.s60/cbsserverconnection.cpp	Thu May 27 12:49:31 2010 +0300
+++ b/javaextensions/wma/sms_cbs/pushplugin/cbs/src.s60/cbsserverconnection.cpp	Fri Jun 11 13:33:44 2010 +0300
@@ -58,7 +58,7 @@
     return cbsConn;
 }
 
-CbsServerConnection::~CbsServerConnection()
+OS_EXPORT CbsServerConnection::~CbsServerConnection()
 {
     JELOG2(EWMA);
     removeDir(mMessageStoreDirName);
@@ -128,7 +128,7 @@
     }
 }
 
-void CbsServerConnection::open(ConnectionListener* aListener,
+OS_EXPORT void CbsServerConnection::open(ConnectionListener* aListener,
                                bool aIsAppLaunched)
 {
     JELOG2(EWMA);
@@ -282,7 +282,7 @@
     }
 }
 
-int CbsServerConnection::retrieveMessage(TJavaMessageParametersBuf& aCbsBuf)
+OS_EXPORT int CbsServerConnection::retrieveMessage(TJavaMessageParametersBuf& aCbsBuf)
 {
     JELOG2(EWMA);
     TCBSParametersBuf cbsParametersBuf;
@@ -328,7 +328,7 @@
 }
 
 
-void CbsServerConnection::close()
+OS_EXPORT void CbsServerConnection::close()
 {
     JELOG2(EWMA);
     // the close and RunL are synchronized to make it SMP safe.

--- a/javaextensions/wma/sms_cbs/pushplugin/sms/build/eabi/javasmsscpluginu.def	Thu May 27 12:49:31 2010 +0300
+++ b/javaextensions/wma/sms_cbs/pushplugin/sms/build/eabi/javasmsscpluginu.def	Fri Jun 11 13:33:44 2010 +0300
@@ -10,23 +10,28 @@
 	_ZN26SmsServerConnectionFactoryD2Ev @ 9 NONAME
 	_ZN4java3wma19SmsServerConnection15retrieveMessageER8TPckgBufI22TJavaMessageParametersE @ 10 NONAME
 	_ZN4java3wma19SmsServerConnection4openEPNS_4push18ConnectionListenerE @ 11 NONAME
-	_ZN4java3wma19SmsServerConnectionC1ERKSbIwSt11char_traitsIwESaIwEES7_ @ 12 NONAME
-	_ZN4java3wma19SmsServerConnectionC2ERKSbIwSt11char_traitsIwESaIwEES7_ @ 13 NONAME
-	_ZN4java3wma19SmsServerConnectionD0Ev @ 14 NONAME
-	_ZN4java3wma19SmsServerConnectionD1Ev @ 15 NONAME
-	_ZN4java3wma19SmsServerConnectionD2Ev @ 16 NONAME
-	_ZN4java3wma20ServerConnectionBase9setFilterERKSbIwSt11char_traitsIwESaIwEE @ 17 NONAME
-	_ZNK4java3wma20ServerConnectionBase18getMessagesOnStoreEv @ 18 NONAME
-	_ZNK4java3wma20ServerConnectionBase6getUriEv @ 19 NONAME
-	_ZNK4java3wma20ServerConnectionBase9getFilterEv @ 20 NONAME
-	_ZTI26SmsServerConnectionFactory @ 21 NONAME ; #<TI>#
-	_ZTIN4java3wma19SmsServerConnectionE @ 22 NONAME ; #<TI>#
-	_ZTIN4java3wma20ServerConnectionBaseE @ 23 NONAME ; #<TI>#
-	_ZTV26SmsServerConnectionFactory @ 24 NONAME ; #<VT>#
-	_ZTVN4java3wma19SmsServerConnectionE @ 25 NONAME ; #<VT>#
-	_ZTVN4java3wma20ServerConnectionBaseE @ 26 NONAME ; #<VT>#
-	_ZThn28_N4java3wma19SmsServerConnection15retrieveMessageER8TPckgBufI22TJavaMessageParametersE @ 27 NONAME ; #<thunk>#
-	_ZThn28_N4java3wma19SmsServerConnection4openEPNS_4push18ConnectionListenerE @ 28 NONAME ; #<thunk>#
-	_ZThn28_N4java3wma19SmsServerConnectionD0Ev @ 29 NONAME ; #<thunk>#
-	_ZThn28_N4java3wma19SmsServerConnectionD1Ev @ 30 NONAME ; #<thunk>#
+	_ZN4java3wma19SmsServerConnection4openEPNS_4push18ConnectionListenerEb @ 12 NONAME
+	_ZN4java3wma19SmsServerConnection5closeEv @ 13 NONAME
+	_ZN4java3wma19SmsServerConnectionC1ERKSbIwSt11char_traitsIwESaIwEES7_ @ 14 NONAME
+	_ZN4java3wma19SmsServerConnectionC2ERKSbIwSt11char_traitsIwESaIwEES7_ @ 15 NONAME
+	_ZN4java3wma19SmsServerConnectionD0Ev @ 16 NONAME
+	_ZN4java3wma19SmsServerConnectionD1Ev @ 17 NONAME
+	_ZN4java3wma19SmsServerConnectionD2Ev @ 18 NONAME
+	_ZN4java3wma20ServerConnectionBase9setFilterERKSbIwSt11char_traitsIwESaIwEE @ 19 NONAME
+	_ZNK4java3wma20ServerConnectionBase18getMessagesOnStoreEv @ 20 NONAME
+	_ZNK4java3wma20ServerConnectionBase6getUriEv @ 21 NONAME
+	_ZNK4java3wma20ServerConnectionBase9getFilterEv @ 22 NONAME
+	_ZTI26SmsServerConnectionFactory @ 23 NONAME
+	_ZTIN4java3wma19SmsServerConnectionE @ 24 NONAME
+	_ZTIN4java3wma20ServerConnectionBaseE @ 25 NONAME
+	_ZTV26SmsServerConnectionFactory @ 26 NONAME
+	_ZTVN4java3wma19SmsServerConnectionE @ 27 NONAME
+	_ZTVN4java3wma20ServerConnectionBaseE @ 28 NONAME
+	_ZThn28_N4java3wma19SmsServerConnection15retrieveMessageER8TPckgBufI22TJavaMessageParametersE @ 29 NONAME
+	_ZThn28_N4java3wma19SmsServerConnection4openEPNS_4push18ConnectionListenerE @ 30 NONAME
+	_ZThn28_N4java3wma19SmsServerConnection4openEPNS_4push18ConnectionListenerEb @ 31 NONAME
+	_ZThn28_N4java3wma19SmsServerConnection5closeEv @ 32 NONAME
+	_ZThn28_N4java3wma19SmsServerConnectionD0Ev @ 33 NONAME
+	_ZThn28_N4java3wma19SmsServerConnectionD1Ev @ 34 NONAME
 
+

--- a/javaextensions/wma/sms_cbs/pushplugin/sms/src.s60/smsserverconnection.cpp	Thu May 27 12:49:31 2010 +0300
+++ b/javaextensions/wma/sms_cbs/pushplugin/sms/src.s60/smsserverconnection.cpp	Fri Jun 11 13:33:44 2010 +0300
@@ -72,7 +72,7 @@
     delete mOpenMonitor;
 }
 
-void SmsServerConnection::open(ConnectionListener* aListener,
+OS_EXPORT void SmsServerConnection::open(ConnectionListener* aListener,
                                bool aIsAppLaunched)
 {
     JELOG2(EWMA);
@@ -299,7 +299,7 @@
 }
 
 
-void SmsServerConnection::close()
+OS_EXPORT void SmsServerConnection::close()
 {
     JELOG2(EWMA);
     // the close and RunL are synchronized to make it SMP safe.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javamanager/javacaptain/extensionplugins/autostarter/build/bwins/javacaptain_ext_autostarteru.def	Fri Jun 11 13:33:44 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	?findDllMethod@@YAP6APAXXZPBD@Z @ 1 NONAME ; void * (*)(void) findDllMethod(char const *)
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javamanager/javacaptain/extensionplugins/autostarter/build/eabi/javacaptain_ext_autostarteru.def	Fri Jun 11 13:33:44 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	_Z13findDllMethodPKc @ 1 NONAME
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javamanager/javacaptain/extensionplugins/autostarter/build/javacaptain_ext_autostarter.pro	Fri Jun 11 13:33:44 2010 +0300
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2010 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: autostarter is plugin for Java Captain that starts auto start
+#   MIDlets
+#
+
+TEMPLATE=lib
+TARGET=javacaptain_ext_autostarter
+CONFIG += omj stl
+CONFIG -= qt
+
+
+LIBS += -ljavacomms -ljavastorage
+
+include(../../../../../build/omj.pri)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javamanager/javacaptain/extensionplugins/autostarter/inc/autostarter.h	Fri Jun 11 13:33:44 2010 +0300
@@ -0,0 +1,64 @@
+/*
+* Copyright (c) 2010 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:  autostarter is Java Captain Symbian plugin that starts
+*               auto start Java applications after they have been installed
+*               and when the device boots.
+*
+*/
+
+#ifndef AUTOSTARTER_H
+#define AUTOSTARTER_H
+
+#include "javaosheaders.h"
+
+#include "eventconsumerinterface.h"
+#include "extensionplugininterface.h"
+
+namespace java
+{
+
+namespace captain
+{
+
+class CoreInterface;
+
+OS_NONSHARABLE_CLASS(AutoStarter) :  public EventConsumerInterface,
+        public ExtensionPluginInterface
+{
+public:
+    AutoStarter();
+    virtual ~AutoStarter();
+
+    // PluginInterface
+    virtual void startPlugin(CoreInterface* aCore);
+    virtual void stopPlugin();
+
+    // EventConsumerInterface
+    virtual void event(const std::string& eventProvider,
+                       java::comms::CommsMessage& aMsg);
+
+    // ExtensionPluginInterface methods
+    virtual EventConsumerInterface* getEventConsumer();
+
+private:
+    bool startMIDletL(const std::wstring& aUid);
+    void checkMIDletsToBeStartedL();
+
+    CoreInterface* mCore;
+};
+
+} // namespace captain
+} // namespace java
+
+#endif // AUTOSTARTER_H