rhodes 2.0.3 → 2.1.0

data/platform/bb/build/bb.rake

@@ -40,7 +40,7 @@ def startmds
   args << "/c"
   args << "run.bat"
 
-  Jake.run("cmd.exe",args, mdshome,true)
+  #Jake.run("cmd.exe",args, mdshome,true)
 end 
 
 def stopmds
@@ -49,7 +49,7 @@ def stopmds
   args << "/c"
   args << "shutdown.bat"
 
-  Jake.run("cmd.exe",args, mdshome, true, true)
+  #Jake.run("cmd.exe",args, mdshome, true, true)
 end 
 
 def startsim(hidden=false)
@@ -138,24 +138,28 @@ end
 
 
 namespace "config" do
-  task :bb => ["config:common"] do
-    $config["platform"] = "bb"
+  task :set_bb_platform do
+    $current_platform = "bb"
+  end
+  
+  task :bb => [:set_bb_platform, "config:common"] do
 
     $rubypath = "res/build-tools/RhoRuby.exe" #path to RhoRuby
 
     $bbver = $app_config["bbver"].to_s
+    $bb6 = true if $bbver == "6.0"
+    
     $builddir = $config["build"]["bbpath"] + "/build"
     $bindir = $app_path + "/bin"
-    $rhobundledir =  $app_path + "/RhoBundle"
+    $tmpdir =  $bindir +"/tmp"
+    $rhobundledir =  $bindir + "/RhoBundle"
     $srcdir =  $bindir + "/RhoBundle"
-    $preverified = $app_path + "/preverified"
+    $preverified = $bindir + "/preverified"
     $targetdir = $bindir + "/target/" + $bbver
     $rubyVMdir = $app_path + "/RubyVM"
     $excludelib = ['**/rational.rb','**/dateOrig.rb']
     $excludeextlib = ['rexml/parsers/baseparser.rb', 'rexml/set.rb']
     $compileERB = $app_path + "/build/compileERB.rb"
-    $tmpdir =  $bindir +"/tmp"
-    $tmpdir_sim =  $bindir +"/tmp_sim"
 
     $assetfolder = $app_path + "/public-" + "bb-" + $bbver
 
@@ -169,21 +173,19 @@ namespace "config" do
     
 
     needsclean = true
-    if File.exists? "#{$bindir}/lastver"
-      lastver = IO.read("#{$bindir}/lastver").strip
-      needsclean = false if $bbver == lastver
+    if File.exists? "#{$app_path}/last_bbver"
+      last_bbver = IO.read("#{$app_path}/last_bbver").strip
+      needsclean = false if $bbver == last_bbver
     end
 
     Rake::Task["clean:bb:all"].invoke if needsclean
     
     mkdir_p $bindir unless File.exists? $bindir
     rm_rf $tmpdir
-    rm_rf $tmpdir_sim
     mkdir_p $tmpdir unless File.exists? $tmpdir
-    mkdir_p $tmpdir_sim unless File.exists? $tmpdir_sim
     mkdir_p  $targetdir if not FileTest.exists?  $targetdir
 
-    File.open("#{$bindir}/lastver", "w") {|f| f.write($bbver)}
+    File.open("#{$app_path}/last_bbver", "w") {|f| f.write($bbver)}
 
   end
 end
@@ -225,6 +227,93 @@ namespace "build" do
       rm_rf $preverified + "/RhoBundle.jar" if File.exists? $preverified + "/RhoBundle.jar"
       rm_rf $rhobundledir + "/RhoBundle.jar" if File.exists? $rhobundledir + "/RhoBundle.jar"
 
+      # start build extensions
+
+      extensionsdir = $tmpdir + "/extensions"
+      extensionstmpdir = $tmpdir + "/extensions/tmp"
+
+      ENV['RHO_PLATFORM'] = 'bb'
+      ENV["TARGET_TEMP_DIR"] = extensionsdir
+      
+      ENV["RHO_ROOT"] = $startdir
+      
+      ENV["JAVA_EXE"] = $config["env"]["paths"]["java"] + "/java.exe"
+      ENV["JAVAC_EXE"] = $config["env"]["paths"]["java"] + "/javac.exe"
+      ENV["JDE_HOME"] = jdehome
+      ENV["JAR_EXE"] = jarexe
+	
+      ENV["RUBYVM_JAR"] = $preverified+"/RubyVM.jar"	
+
+      mkdir_p extensionsdir unless File.directory? extensionsdir
+      mkdir_p extensionstmpdir unless File.directory? extensionstmpdir
+
+      extentries = []
+      
+      puts "$app_config['extensions'] : #{$app_config['extensions']}"
+      $app_config["extensions"].each do |ext|
+        $app_config["extpaths"].each do |p|
+          extpath = File.join(p, ext, 'ext')
+          if RUBY_PLATFORM =~ /(win|w)32$/
+            next unless File.exists? File.join(extpath, 'build.bat')
+          else
+            next unless File.executable? File.join(extpath, 'build')
+          end
+          
+          extroot = File.join(p,ext)
+
+          extyml = File.join(extroot, "ext.yml")
+          if File.file? extyml
+            extconf = Jake.config(File.open(extyml))
+            javaentry = extconf["javaentry"]
+            extentries << javaentry unless javaentry.nil?
+          end
+
+
+          ext_tmp_dir = File.join(ENV["TARGET_TEMP_DIR"], ext) 
+          ENV['TEMP_FILES_DIR'] = ext_tmp_dir
+	      mkdir_p ext_tmp_dir unless File.directory? ext_tmp_dir
+
+          if RUBY_PLATFORM =~ /(win|w)32$/
+            puts Jake.run('build.bat', [], extpath)
+          else
+            puts Jake.run('./build', [], extpath)
+          end
+          exit 1 unless $?.success?
+
+	  rm_rf ext_tmp_dir
+
+        end
+      end
+
+      # finish build extensions
+
+      # start adding builded extension jars to RhoBundle.jar
+
+      # unpack all extensions JARs to extensionstmpdir	
+      $app_config["extensions"].each do |ext|
+        $app_config["extpaths"].each do |p|
+          extpath = File.join(p, ext, 'ext')
+          if RUBY_PLATFORM =~ /(win|w)32$/
+            next unless File.exists? File.join(extpath, 'build.bat')
+          else
+            next unless File.executable? File.join(extpath, 'build')
+          end
+          Jake.unjar(extensionsdir + "/" + ext + ".jar",extensionstmpdir)
+        end
+      end
+
+      Jake.unjar($bindir + "/RhoBundle.jar",extensionstmpdir)	
+
+      rm_rf $bindir + "/RhoBundle.jar" if File.exists? $bindir + "/RhoBundle.jar"
+
+      # repack new RhoBundle jar
+
+      Jake.jar($bindir + "/RhoBundle.jar",extensionstmpdir + "/META-INF/manifest.mf",extensionstmpdir,true)
+
+      rm_rf extensionsdir if File.exists? extensionsdir
+
+      # finish adding builded extension jars to RhoBundle.jar 	
+
       #XXX make preverify function in Jake
       args = []
       #args << "-verbose"
@@ -247,8 +336,18 @@ namespace "build" do
     task :devrhobundle => [:set_dev_outname,:rhobundle] do
       cp $preverified + "/RhoBundle.jar", "platform/bb/RhoBundle/RhoBundle.jar"
       
-      sdcardpath = $config["env"]["paths"][$bbver]["jde"] +"/simulator/sdcard/Rho/rhodes/apps/rhoconfig.txt"
-      cp $app_path+"/rhoconfig.txt", sdcardpath if File.exists? sdcardpath
+      sdcardpath = $config["env"]["paths"][$bbver]["jde"] +"/simulator/sdcard/Rho/rhodes"
+      
+      namepath = File.join(sdcardpath,"name.txt")        
+      old_appname = File.read(namepath) if File.exists?(namepath)
+      rm_rf sdcardpath if old_appname != $appname
+      mkdir_p sdcardpath unless File.exists?(sdcardpath)
+      
+      confpath = File.join( sdcardpath, "/apps/rhoconfig.txt" )
+      rm_rf confpath if File.exists? confpath
+      
+      File.open(namepath, "w") { |f| f.write($appname) }      
+      
     end
 
     def create_jarmanifest
@@ -283,7 +382,7 @@ namespace "build" do
         
       puts "Modify Capabilities.java"
       $stdout.flush
-      capabilities = File.join($builddir, "..", "..", "..", "platform", "shared", "rubyJVM", "src", "com", "rho", "Capabilities.java")
+      capabilities = File.join($builddir, "..", "..", "..", "platform", "bb", "RubyVM", "src", "com", "rho", "Capabilities.java")
       File.open(capabilities, 'w') do |f|
         f.puts "package com.rho;"
         f.puts ""
@@ -292,6 +391,55 @@ namespace "build" do
         f.puts "  public static final boolean RUNAS_SERVICE = #{has_push.to_s};"
         f.puts "}"
       end
+
+
+      extentries = []
+
+      if $app_config["extensions"]
+          $app_config["extensions"].each do |ext|
+            $app_config["extpaths"].each do |p|
+              extpath = File.join(p, ext, 'ext')
+              if RUBY_PLATFORM =~ /(win|w)32$/
+                next unless File.exists? File.join(extpath, 'build.bat')
+              else
+                next unless File.executable? File.join(extpath, 'build')
+              end
+              
+              extroot = File.join(p,ext)
+
+              extyml = File.join(extroot, "ext.yml")
+              if File.file? extyml
+                extconf = Jake.config(File.open(extyml))
+                javaentry = extconf["javaentry"]
+                extentries << javaentry unless javaentry.nil?
+              end
+
+            end
+          end
+      end
+        
+      exts = $startdir + "/platform/bb/RubyVM/src/com/rho/Extensions.java"
+
+      File.open(exts, "w") do |f|
+        f.puts "// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!"
+        f.puts "// Generated #{Time.now.to_s}"
+        f.puts "package com.rho; "
+        f.puts " "
+        f.puts "public class Extensions {"
+        f.puts " "
+        f.puts "public static String[] extensions = {"
+
+        extentries.each do |entry|
+          f.puts '          "' + entry + '",'
+        end
+
+        f.puts '""'
+        f.puts "};"
+        f.puts " "
+        f.puts "}"
+      end
+
+
     end
     
 #    desc "Build RubyVM"
@@ -506,6 +654,49 @@ namespace "package" do
       end
           
     end
+    
+    def runProGuard(target_jar, lib_jar)
+      jdehome = $config["env"]["paths"][$bbver]["jde"]
+      java = $config["env"]["paths"]["java"] + "/java.exe"
+      jde = $config["env"]["paths"][$bbver]["jde"]
+      proguard =  File.join( $startdir, '/res/build-tools/proguard-4.5.1.jar' )
+      out_jar = File.join( File.dirname(target_jar), File.basename(target_jar, File.extname(target_jar) ) + "_out.jar" )
+      puts "****out jar: #{out_jar}"
+      
+      args = []
+      args << "-jar"
+      args << proguard
+      args << "-injars"
+      args << target_jar
+      args << "-outjars"
+      args << out_jar
+      args << "-libraryjars"
+      args << jdehome + "/lib/net_rim_api.jar"
+      args << "-overloadaggressively"
+      args << "-repackageclasses '' "
+      args << "-allowaccessmodification"
+      args << "-microedition"
+      args << "-printseeds"
+      args << "-dontusemixedcaseclassnames"
+      #args << "-keep public class * extends net.rim.device.api.ui.UiApplication"
+      #args << "-keep final public class rhomobile.RhodesApplication"
+      args << "-keep final public class rhomobile.RhodesApplication { public static void main(java.lang.String[]); }"
+      #args << "-keep public class xruby.version.main { public static void main(java.lang.String[]); }"
+      #args << "-keep public class xruby.rhoframework.main { public static void main(java.lang.String[]); }"
+      
+      #args << "-keepclasseswithmembers public class * {  public static void main(java.lang.String[]); }"
+      #args << "-dontobfuscate"
+      #args << "-dontpreverify"
+      #args << "-target 1.3"
+      args << "-dontshrink"
+      args << "-dontoptimize"
+      
+      puts Jake.run(java,args)
+      $stdout.flush
+      
+      rm_rf target_jar
+      File.rename( out_jar, target_jar )
+    end
 
 #    desc "Package all production (all parts in one package)"
     task :production => ["build:bb:rhodes"] do
@@ -520,6 +711,24 @@ namespace "package" do
       Jake.unjar($preverified + "/RhoBundle.jar", $tmpdir)
       Jake.unjar($preverified + "/rhodes.jar", $tmpdir)
 
+      if $target_sim
+          #Changing rhoconfig.txt to work on Windows 7
+          if RUBY_PLATFORM =~ /(win|w)32$/
+	        require  'win32/registry'
+
+	        def getWindowsProductNameString
+	            Win32::Registry::HKEY_LOCAL_MACHINE.open('SOFTWARE\Microsoft\Windows NT\CurrentVersion') do |reg|
+	                reg_typ, reg_val = reg.read('ProductName')
+	                return reg_val
+	            end
+	        end
+
+      	    if getWindowsProductNameString =~ /Windows 7/
+	            fixWin7SimBug($tmpdir + "/apps/rhoconfig.txt")	
+	        end
+          end
+      end
+      
       if $bbver =~ /^4\.[012](\..*)$/
         max_size = 65536
         Dir.glob( $tmpdir + "/**/*" ).each do |f|
@@ -534,7 +743,7 @@ namespace "package" do
       end
 
       Jake.jar($bindir + "/" + $outfilebase + ".jar",$builddir + "/manifest.mf",$tmpdir,true)
-
+      
       Jake.rapc($outfilebase,
         $targetdir,
         jdehome + "/lib/net_rim_api.jar",
@@ -555,68 +764,12 @@ namespace "package" do
       create_alx_file('rhodesApp', $outfilebase)
     end
 
-#    desc "Package all production (all parts in one package) for simulator"
-    task :production_sim => ["build:bb:rhodes"] do
-      jdehome = $config["env"]["paths"][$bbver]["jde"]
-      rm_rf $tmpdir_sim
-      mkdir_p $tmpdir_sim
-
-      rm_rf $targetdir
-      mkdir_p $targetdir
-
-      Jake.unjar($preverified + "/RubyVM.jar", $tmpdir_sim)
-      Jake.unjar($preverified + "/RhoBundle.jar", $tmpdir_sim)
-      Jake.unjar($preverified + "/rhodes.jar", $tmpdir_sim)
-
-      #Changing rhoconfig.txt to work on Windows 7
-      if RUBY_PLATFORM =~ /(win|w)32$/
-	require  'win32/registry'
-
-	def getWindowsProductNameString
-	    Win32::Registry::HKEY_LOCAL_MACHINE.open('SOFTWARE\Microsoft\Windows NT\CurrentVersion') do |reg|
-	        reg_typ, reg_val = reg.read('ProductName')
-	        return reg_val
-	    end
-	end
-
-      	if getWindowsProductNameString =~ /Windows 7/
-	    fixWin7SimBug($tmpdir_sim + "/apps/rhoconfig.txt")	
-	end
-      end
-
-      if $bbver =~ /^4\.[012](\..*)$/
-        max_size = 65536
-        Dir.glob( $tmpdir_sim + "/**/*" ).each do |f|
-          if File.size( f ) > max_size
-            puts "File size of " + f + " is more than " + max_size.to_s + " bytes"
-            puts "There is no ability to pack this file into .cod file for BB " + $bbver
-            puts "Please reduce its size and try again"
-            $stdout.flush
-            Process.exit
-          end
-        end
-      end
-
-      Jake.jar($bindir + "/" + $outfilebase + ".jar",$builddir + "/manifest.mf",$tmpdir_sim,true)
-
-      Jake.rapc($outfilebase,
-        $targetdir,
-        jdehome + "/lib/net_rim_api.jar",
-        $bindir + "/" + $outfilebase + ".jar",
-        $appname,
-        $app_config["vendor"],
-        $app_config["version"],
-        "resources/icon.png",
-        false,
-        true
-      )
-      unless $? == 0
-        puts "Error in RAPC"
-        exit 1
-      end
-      $stdout.flush
-      
-      create_alx_file('rhodesApp', $outfilebase)
+    task :set_simulator do
+        $target_sim = true
+    end
+    
+#   desc "Package all production (all parts in one package) for simulator"
+    task :production_sim => [:set_simulator, :production] do
     end
 
     task :set_dev_build do
@@ -626,12 +779,10 @@ namespace "package" do
 #    desc "Package all dev (each part in separate package)"
     task :dev => [ :set_dev_build, :rubyvm,:rhobundle,:rhodes] do
     end
+    
   end
 end
 
-
-
-
 namespace "device" do
   namespace "bb" do
     desc "Build debug for device"
@@ -716,15 +867,10 @@ namespace "clean" do
       rm_rf $tmpdir
     end
 
-#    desc "Clean temp simulator dir"
-    task :tempdir_sim => "config:bb" do
-      rm_rf $tmpdir_sim
-    end
-
 #    desc "Clean all"
     task :all => [:preverified,:packaged,:tempdir] do
       rm_rf $bindir
-      rm_rf $rhobundledir
+      #rm_rf $rhobundledir
     end
 
   end
@@ -743,7 +889,7 @@ namespace "run" do
         startsim
       end
       
-      task :spec => ["clean:bb", "run:bb:stopmdsandsim", "package:bb:production_sim"] do
+      task :spec => ["run:bb:stopmdsandsim", "package:bb:production_sim"] do
         jde = $config["env"]["paths"][$bbver]["jde"]
         cp_r File.join($targetdir,"/."), jde + "/simulator"
         rm_rf jde + "/simulator/sdcard/Rho"
@@ -783,6 +929,10 @@ namespace "run" do
         $stdout.flush
         
       end
+
+      task :phone_spec do
+        Jake.run_spec_app('bb', 'phone_spec')
+      end
   end
   
   desc "Builds everything, loads and starts bb sim and mds"

data/platform/bb/rhodes/platform/6.0/com/rho/BrowserAdapter5.java

@@ -0,0 +1,155 @@
+package com.rho;
+
+import net.rim.device.api.browser.field.RenderingOptions;
+import net.rim.device.api.browser.field2.*;
+import net.rim.device.api.system.Application;
+
+import javax.microedition.io.HttpConnection;
+import javax.microedition.io.InputConnection;
+
+import com.rho.RhodesApp;
+import com.rho.net.URI;
+
+import rhomobile.Utilities;
+import rhomobile.RhodesApplication.PrimaryResourceFetchThread;
+import rhomobile.RhodesApplication;
+
+//http://rim.lithium.com/t5/Java-Development/Browser-events-on-JDK-5-field2-package/m-p/430991
+//http://208.74.204.192/t5/Web-Development/Embedded-Browser-Ajax-support/m-p/410260;jsessionid=CDE85D9F4D88217EA118DE3F5DF9FEFD
+//http://supportforums.blackberry.com/t5/Web-Development/JavaScript-not-working-on-Black-Berry-Simulator-8330/m-p/412687#M3397
+
+public class BrowserAdapter5 implements IBrowserAdapter 
+{
+	private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
+		new RhoLogger("BrowserAdapter");
+    private RhoMainScreen m_oMainScreen;
+    private BrowserField m_oBrowserField;
+    private BrowserFieldConfig m_oConfig;
+    
+    private RhodesApplication m_app;
+ 
+    private class RhoProtocolController extends ProtocolController
+    {
+		public RhoProtocolController(BrowserField browserField) {
+			super(browserField);
+		}
+
+		public void handleNavigationRequest(BrowserFieldRequest request)
+				throws Exception 
+		{
+			String url = request.getURL();
+
+            if ( request.getPostData() == null ||
+            		request.getPostData().length == 0 )
+            {
+            	//String referrer = request.getHeaders().getPropertyValue("referer");
+               	m_app.addToHistory(url, null );
+            }
+            
+			PrimaryResourceFetchThread thread = new PrimaryResourceFetchThread(
+				url, request.getHeaders(),request.getPostData(),url);
+			thread.start();
+		}
+
+		public InputConnection handleResourceRequest(BrowserFieldRequest request)
+				throws Exception 
+		{
+			String url = request.getURL();
+    		if ( RhodesApp.getInstance().isRhodesAppUrl(url) || URI.isLocalData(url))
+    		{
+                HttpConnection connection = Utilities.makeConnection(url, request.getHeaders(), null, null);
+                
+                return connection;
+    		}else
+    			return super.handleResourceRequest(request);
+		}
+
+		public void setNavigationRequestHandler(String protocol,
+				BrowserFieldNavigationRequestHandler handler) {
+			super.setNavigationRequestHandler(protocol, handler);
+		}
+
+		public void setResourceRequestHandler(String protocol,
+				BrowserFieldResourceRequestHandler handler) {
+			super.setResourceRequestHandler(protocol, handler);
+		}
+    	
+    };
+    private RhoProtocolController m_oController;
+    
+	public BrowserAdapter5(RhoMainScreen oMainScreen, RhodesApplication app) 
+	{
+		m_oMainScreen = oMainScreen;
+		m_app = app;
+		
+		m_oConfig = new BrowserFieldConfig();
+		m_oConfig.setProperty( BrowserFieldConfig.NAVIGATION_MODE, BrowserFieldConfig.NAVIGATION_MODE_POINTER );
+		m_oConfig.setProperty( BrowserFieldConfig.JAVASCRIPT_ENABLED, Boolean.TRUE );
+//		m_oConfig.setProperty( BrowserFieldConfig.NAVIGATION_MODE, BrowserFieldConfig.NAVIGATION_MODE_CARET );
+		m_oConfig.setProperty( BrowserFieldConfig.ENABLE_COOKIES, Boolean.TRUE );
+	}
+
+	public void setFullBrowser()
+	{
+	}
+	
+	private void createBrowserField()
+	{
+		m_oBrowserField = new BrowserField(m_oConfig);
+		m_oBrowserField.getRenderingOptions().setProperty(RenderingOptions.CORE_OPTIONS_GUID, RenderingOptions.ALLOW_POPUPS, true);
+		m_oController = new RhoProtocolController(m_oBrowserField);
+		m_oConfig.setProperty(BrowserFieldConfig.CONTROLLER, m_oController);
+		
+		BrowserFieldListener _listener = new BrowserFieldListener() 
+		{ 
+		     public void documentLoaded(BrowserField browserField, 
+		    		 org.w3c.dom.Document document) throws Exception 
+		     {
+		    	synchronized (Application.getEventLock())
+		    	{
+		    		m_oMainScreen.deleteAll();
+					m_oMainScreen.add(m_oBrowserField);
+		     	}
+		     }
+		     /*
+		     public void downloadProgress(BrowserField browserField, 
+		    		 net.rim.device.api.browser.field.ContentReadEvent event)throws Exception
+		     {
+		        //Add your code here.
+		     }*/
+		};
+		m_oBrowserField.addListener( _listener );
+	}
+	
+    public void processConnection(HttpConnection connection, Object e) 
+    {
+        synchronized (Application.getEventLock()) 
+        {
+        	createBrowserField();        	
+        	m_oBrowserField.displayContent(connection,  (e != null ? (String)e : "") );
+        }
+    }
+
+    public void executeJavascript(String strJavascript)
+    {
+        //synchronized (Application.getEventLock()) 
+        {
+        	BrowserField field = (BrowserField)m_oMainScreen.getField(0);
+        	field.executeScript(strJavascript);
+        }
+    }
+    
+    //http://supportforums.blackberry.com/t5/Java-Development/Tab-Navigation/td-p/381156
+    public boolean navigationMovement(int dx, int dy, int status, int time)
+    {
+    	//TODO: try to change navigation
+    	/*
+    	Field focField = m_oBrowserField.getLeafFieldWithFocus();
+    	Manager focManager = focField != null ? focField.getManager() : null;
+    	boolean bHorizontal = false;
+    	if ( focManager != null && focManager instanceof HorizontalFieldManager)
+    		bHorizontal = true;
+    	*/	
+    	return false;
+    }
+}

data/platform/bb/rhodes/platform/6.0/com/rho/RhoMainScreen.java

@@ -0,0 +1,36 @@
+package com.rho;
+
+import net.rim.device.api.system.Display;
+import net.rim.device.api.ui.TouchEvent;
+import net.rim.device.api.ui.container.MainScreen;
+
+public abstract class RhoMainScreen extends MainScreen {
+	
+	protected abstract void onTouchUnclick();
+	
+	protected boolean touchEvent(TouchEvent message) {
+		int nEvent = message.getEvent();
+		
+		if ( nEvent == TouchEvent.UNCLICK )
+		{
+			onTouchUnclick();
+			return true;
+		}
+		
+		return super.touchEvent(message);
+	}
+	
+	public boolean isTouchScreen()
+	{
+	    //DeviceInfo.getDevicename()
+	    return net.rim.device.api.ui.Touchscreen.isSupported();
+	}
+	
+	protected abstract void onChangeOrientation(int x, int y, int nOrientation);
+	protected void sublayout(int arg0, int arg1) 
+	{
+		onChangeOrientation(arg0, arg1, Display.getOrientation()== Display.ORIENTATION_LANDSCAPE ? 1 : 2);
+		super.sublayout(arg0, arg1);
+	}
+	
+};

data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java

@@ -121,6 +121,11 @@ public class RhoRubyHelper implements IRhoRubyHelper {
 		RhodesApplication.getInstance().navigateBack();
 	}
 	
+	public void app_exit()
+	{
+		RhodesApplication.getInstance().close();
+	}
+	
 	static Hashtable m_appProperties = new Hashtable(); 
 	public String getAppProperty(String name)
 	{

data/platform/bb/rhodes/src/com/rho/file/Jsr75RAFileImpl.java

@@ -327,12 +327,12 @@ public class Jsr75RAFileImpl implements IRAFile {
 	}
 
 	public boolean exists() {
-		return m_file.exists();
+		return m_file != null && m_file.exists();
 	}
 	
 	public void rename(String newName) throws IOException {
 		//PROF.START(RhoProfiler.FILE_RENAME);
-		if (m_file.exists())
+		if (m_file != null && m_file.exists())
 			m_file.rename(newName);
 		//PROF.STOP(RhoProfiler.FILE_RENAME);
 	}

data/platform/bb/rhodes/src/com/rho/net/BaseSocket.java

@@ -205,6 +205,12 @@ public class BaseSocket extends RubyBasic {
     	return m_conn == null;
     }
 	
+	public void flush()throws IOException
+    {
+    	if (m_os != null)
+    		m_os.flush();
+    }
+	
 	public void close()throws IOException
     {
     	if ( m_conn != null )