rhodes 3.3.3.beta.1 → 3.3.3.beta.2

data/platform/iphone/Classes/Signature/SignatureView.h

@@ -27,8 +27,20 @@
 #import <UIKit/UIKit.h>
 
 
+@interface SignatureViewProperties : NSObject {
+}
+
+@property (nonatomic, assign) unsigned int penColor;
+@property (nonatomic, assign) float penWidth;
+@property (nonatomic, assign) unsigned int bgColor;
+@property (nonatomic, assign) int left;
+@property (nonatomic, assign) int top;
+@property (nonatomic, assign) unsigned int width;
+@property (nonatomic, assign) unsigned int height;
 
 
+@end
+
 
 @interface SignatureView : UIView {
 

data/platform/iphone/Classes/Signature/SignatureView.m

@@ -26,6 +26,13 @@
 
 #import "SignatureView.h"
 
+
+@implementation SignatureViewProperties
+
+@synthesize penColor, penWidth, bgColor, left, top, width, height;
+@end
+
+
 @implementation SignatureView
 
 -(CGContextRef)CreateRGBABitmapContext:(int)width height:(int)height
@@ -116,6 +123,7 @@
         penColor = 0xFF66009A;
         penWidth = 3.0;
         bgColor = 0xFFFFFFFF;
+
     }
 	mPath = nil;
 	[self doClear];
@@ -134,13 +142,13 @@
 	CGContextSetRGBFillColor(context,   ((float)((bgColor & 0xFF0000) >> 16))/255.0, 
                                         ((float)((bgColor & 0xFF00) >> 8))/255.0,
                                         ((float)((bgColor & 0xFF)))/255.0,
-                                        1);
+                                        ((float)((bgColor & 0xFF000000) >> 24))/255.0);
 	
     
     CGContextSetRGBStrokeColor(context, ((float)((penColor & 0xFF0000) >> 16))/255.0,
                                         ((float)((penColor & 0xFF00) >> 8))/255.0,
                                         ((float)((penColor & 0xFF)))/255.0,
-                                        1);
+                                        ((float)((penColor & 0xFF000000) >> 24))/255.0);
 	CGContextFillRect(context, rect);
 	
 	// draw signature
@@ -180,7 +188,7 @@
     CGContextSetRGBStrokeColor(context, ((float)((penColor & 0xFF0000) >> 16))/255.0,
                                ((float)((penColor & 0xFF00) >> 8))/255.0,
                                ((float)((penColor & 0xFF)))/255.0,
-                               1);
+                               ((float)((penColor & 0xFF000000) >> 24))/255.0);
 	CGContextFillRect(context, rect);
 	
 	// draw signature

data/platform/iphone/Classes/SimpleMainView.m

@@ -36,6 +36,8 @@
 
 #include "NativeBar.h"
 
+#import "SignatureDelegate.h"
+
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "SimpleMainView"
 
@@ -659,6 +661,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
 	//[webView setNeedsDisplay];
 	//}
 	//else {
+        [[SignatureDelegate getSharedInstance] hideSignatureInlineView];
 		[webView goBack];
 	//}
 }
@@ -989,6 +992,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
         NSMutableURLRequest *r = (NSMutableURLRequest*)request;
         [r addValue:c forHTTPHeaderField:@"Cookie"];
     }
+    [[SignatureDelegate getSharedInstance] hideSignatureInlineView];
     return YES;
 }
 

data/platform/iphone/Classes/rho/net/NetRequestImpl.m

@@ -47,8 +47,8 @@ typedef void (*FSAVECONNDATA)(void* pThis, void* pData);
  */
 typedef enum {
 	NotReachable = 0,
-	ReachableViaCarrierDataNetwork,
-	ReachableViaWiFiNetwork
+	ReachableViaCarrierDataNetwork = 1,
+	ReachableViaWiFiNetwork = 2
 } NetworkStatus;
 
 void rho_net_impl_network_indicator(int active)
@@ -56,6 +56,58 @@ void rho_net_impl_network_indicator(int active)
 	[UIApplication sharedApplication].networkActivityIndicatorVisible = active ? YES : NO;
 }
 
+
+VALUE rho_sys_has_wifi_network() {
+	SCNetworkReachabilityFlags defaultRouteFlags;
+	
+	int defaultRouteIsAvailable = 0;
+	
+	int i = 0;
+	while  ((!defaultRouteIsAvailable) && (i++ < MAX_CONNECTION_TRY)) {
+		defaultRouteIsAvailable = isNetworkAvailableFlags(&defaultRouteFlags);
+    }
+	
+	if (defaultRouteIsAvailable == 1) {
+		if (defaultRouteFlags & kSCNetworkReachabilityFlagsIsDirect) {
+			// Ad-Hoc network, not available
+			return rho_ruby_create_boolean(0);
+		}
+		else if (defaultRouteFlags & ReachableViaWiFiNetwork) {
+			// WiFi network available
+			return rho_ruby_create_boolean(1);
+		}
+	}
+	return rho_ruby_create_boolean(0);
+}
+
+VALUE rho_sys_has_cell_network() {
+	SCNetworkReachabilityFlags defaultRouteFlags;
+	
+	int defaultRouteIsAvailable = 0;
+	
+	int i = 0;
+	while  ((!defaultRouteIsAvailable) && (i++ < MAX_CONNECTION_TRY)) {
+		defaultRouteIsAvailable = isNetworkAvailableFlags(&defaultRouteFlags);
+    }
+	
+	if (defaultRouteIsAvailable == 1) {
+		if (defaultRouteFlags & kSCNetworkReachabilityFlagsIsDirect) {
+			// Ad-Hoc network, not available
+			return rho_ruby_create_boolean(0);
+		}
+		else if (defaultRouteFlags & ReachableViaCarrierDataNetwork) {
+			// Cell network available
+			return rho_ruby_create_boolean(1);
+		}
+		else if (defaultRouteFlags & ReachableViaWiFiNetwork) {
+			// Wifi network available
+			return rho_ruby_create_boolean(1);
+		}
+	}
+	return rho_ruby_create_boolean(0);
+}
+
+
 // Determines network connectivity
 VALUE rho_sys_has_network() {
 	SCNetworkReachabilityFlags defaultRouteFlags;
@@ -109,6 +161,47 @@ int rho_net_ping_network(const char* szHost)
 	return returnData == NULL ? 0 : 1;
 }
 
+int networkStatusForFlags(SCNetworkReachabilityFlags flags)
+{
+    if ((flags & kSCNetworkReachabilityFlagsReachable) == 0)
+    {
+        // if target host is not reachable
+        return NotReachable;
+    }
+    
+    int retVal = NotReachable;
+    
+    if ((flags & kSCNetworkReachabilityFlagsConnectionRequired) == 0)
+    {
+        // if target host is reachable and no connection is required
+        //  then we'll assume (for now) that your on Wi-Fi
+        retVal = ReachableViaWiFiNetwork;
+    }
+    
+    
+    if ((((flags & kSCNetworkReachabilityFlagsConnectionOnDemand ) != 0) ||
+         (flags & kSCNetworkReachabilityFlagsConnectionOnTraffic) != 0))
+    {
+        // ... and the connection is on-demand (or on-traffic) if the
+        //     calling application is using the CFSocketStream or higher APIs
+        
+        if ((flags & kSCNetworkReachabilityFlagsInterventionRequired) == 0)
+        {
+            // ... and no [user] intervention is needed
+            retVal = ReachableViaWiFiNetwork;
+        }
+    }
+    
+    if ((flags & kSCNetworkReachabilityFlagsIsWWAN) == kSCNetworkReachabilityFlagsIsWWAN)
+    {
+        // ... but WWAN connections are OK if the calling application
+        //     is using the CFNetwork (CFSocketStream?) APIs.
+        retVal = retVal | ReachableViaCarrierDataNetwork;
+    }
+    return retVal;
+}
+
+
 int isNetworkAvailableFlags(SCNetworkReachabilityFlags *outFlags)
 {
 	struct sockaddr_in zeroAddress;
@@ -141,7 +234,9 @@ int isNetworkAvailableFlags(SCNetworkReachabilityFlags *outFlags)
 	// Callers of this method might want to use the reachability flags, so if an 'out' parameter
 	// was passed in, assign the reachability flags to it.
 	if (outFlags) {
-		*outFlags = flags;
+        
+        int fl = networkStatusForFlags(flags);
+		*outFlags = fl;
 	}
 	CFRelease(defaultRouteReachability);
 	return reachable;

data/platform/iphone/Info.plist

@@ -38,7 +38,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.3.2</string>
+	<string>3.3.3</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchImageFile</key>

data/platform/iphone/rbuild/iphone.rake

@@ -475,8 +475,23 @@ namespace "config" do
     $tmpdir =  $bindir +"/tmp"
 
     $devroot = '/Developer' if $devroot.nil?
+    $iphonesim = File.join($startdir, 'res/build-tools/iphonesim/build/Release/iphonesim') if $iphonesim.nil?
+
 
     $xcodebuild = $devroot + "/usr/bin/xcodebuild"
+    
+    if !File.exists? $xcodebuild
+        $xcodebuild = "/Applications/Xcode.app/Contents/Developer" + "/usr/bin/xcodebuild"
+        $devroot = '/Applications/Xcode.app/Contents/Developer'
+        $iphonesim = File.join($startdir, 'res/build-tools/iphonesim/build/Release/iphonesim_43')
+    end
+    
+    if !File.exists? $xcodebuild
+        puts 'ERROR: can not found XCode command line tools'
+        puts 'Install XCode to default location' 
+        puts 'For XCode from 4.3 and later - you should install Command Line Tools package ! Open XCode - Preferences... - Downloads - Components - Command Line Tools'
+        exit 1
+    end
 
     $homedir = ENV['HOME']
     $simdir = "#{$homedir}/Library/Application Support/iPhone Simulator/"
@@ -761,8 +776,8 @@ namespace "run" do
       Thread.new {
             # run spec
             rhorunner = File.join($startdir, $config["build"]["iphonepath"],"build/#{$configuration}-iphonesimulator/rhorunner.app")
-            iphonesim = File.join($startdir, 'res/build-tools/iphonesim/build/Release/iphonesim')
-            commandis = iphonesim + ' launch "' + rhorunner + '" ' + $sdkver.gsub(/([0-9]\.[0-9]).*/,'\1') + ' ' + $emulatortarget + ' "' +log_name+'"'
+            #iphonesim = File.join($startdir, 'res/build-tools/iphonesim/build/Release/iphonesim')
+            commandis = $iphonesim + ' launch "' + rhorunner + '" ' + $sdkver.gsub(/([0-9]\.[0-9]).*/,'\1') + ' ' + $emulatortarget + ' "' +log_name+'"'
             puts 'use iphonesim tool - open iPhone Simulator and execute our application, also support device family (iphone/ipad)'
             puts 'execute command : ' + commandis
             system(commandis)
@@ -1097,10 +1112,8 @@ namespace "run" do
   desc "Builds everything, launches iphone simulator"
   task :iphone => :buildsim do
     
-    iphonesim = File.join($startdir, 'res/build-tools/iphonesim/build/Release/iphonesim')
-
     rhorunner = File.join($startdir, $config["build"]["iphonepath"],"build/#{$configuration}-iphonesimulator/rhorunner.app")
-    commandis = iphonesim + ' launch "' + rhorunner + '" ' + $sdkver.gsub(/([0-9]\.[0-9]).*/,'\1') + ' ' + $emulatortarget
+    commandis = $iphonesim + ' launch "' + rhorunner + '" ' + $sdkver.gsub(/([0-9]\.[0-9]).*/,'\1') + ' ' + $emulatortarget
 
     thr = Thread.new do
        puts 'start thread with execution of application' 

data/platform/shared/RhoConnectClient/RhoConnectClient.cpp

@@ -141,7 +141,7 @@ void rho_connectclient_processmodels(RHOM_MODEL* pModels, int nModels)
 void rho_connectclient_init(RHOM_MODEL* pModels, int nModels)
 {
     rho_logconf_Init(rho_native_rhopath(), "");
-    CRhodesAppBase::Create( rho_native_rhopath() );
+    CRhodesAppBase::Create( rho_native_rhopath(), rho_native_rhopath(), rho_native_rhopath() );
 
     String strDbPath = rho_native_rhopath();
 

data/platform/shared/common/ExtManager.h

@@ -38,26 +38,56 @@ namespace common {
 
 struct CRhoExtData
 {
-	void*	    m_hWnd;
+	HWND	    m_hWnd;
 	void*		m_hInstance;
 	int			m_iTabIndex;
+    HWND       m_hBrowserWnd;
 };
 
 struct IRhoExtension 
 {
-    virtual void onSetPropertiesData( const wchar_t* pData, const CRhoExtData& oExtData ){}
+    virtual ~IRhoExtension(){}
+    virtual void onSetPropertiesData( const wchar_t* pPropID, const wchar_t* pData, const CRhoExtData& oExtData ){}
     virtual void onSetProperty( const wchar_t* pName, const wchar_t* pValue, const CRhoExtData& oExtData ){}
-    virtual void onBeforeNavigate(const CRhoExtData& oExtData){}
+    virtual void onBeforeNavigate(const wchar_t* szUrlBeingNavigatedTo, const CRhoExtData& oExtData){}
+    virtual void onNavigateComplete(const wchar_t* szUrlBeingNavigatedTo, const CRhoExtData& oExtData){}
+    virtual void onDocumentComplete(const wchar_t* szUrlOfDocument, const CRhoExtData& oExtData){}
+    virtual bool onWndMsg(MSG& oMsg){return false;}
+    virtual long OnNavigateTimeout(const wchar_t* szUrlBeingNavigatedTo, const CRhoExtData& oExtData){return 0;}
+    virtual long OnSIPState(bool bSIPState, const CRhoExtData& oExtData){return 0;}
+    virtual long OnAlertPopup(int nEnum, void* pData, const CRhoExtData& oExtData){return 0;}
+    virtual long OnNavigateError(const wchar_t* szUrlBeingNavigatedTo, const CRhoExtData& oExtData){return 0;}
+    virtual void OnAppActivate(bool bActivate, const CRhoExtData& oExtData){}
 };
 
 struct IRhoExtManager
 {
+    virtual ~IRhoExtManager(){}
+
     virtual void onUnhandledProperty( const wchar_t* pModuleName, const wchar_t* pName, const wchar_t* pValue, const CRhoExtData& oExtData ) = 0;
-    virtual void executeRuby( const char* szMethod, const char* szParam) = 0;
-    virtual void executeRubyCallback( const char* szCallback, const char* szCallbackBody, const char* szCallbackData) = 0;
+    virtual void executeRubyCallback( const char* szCallback, const char* szCallbackBody, const char* szCallbackData, bool bWaitForResponse) = 0;
     virtual void requireRubyFile( const char* szFilePath ) = 0;
 
     virtual void navigate(const wchar_t* szUrl) = 0;
+    virtual bool existsJavascript(const wchar_t* szJSFunction) = 0;
+    virtual void executeJavascript(const wchar_t* szJSFunction) = 0;
+
+    virtual void rhoLog(int nSeverity, const char* szModule, const char* szMsg, const char* szFile, int nLine) = 0;
+    virtual StringW getCurrentUrl() = 0;
+    virtual void stopNavigate() = 0;
+    virtual void historyForward() = 0;
+    virtual void historyBack() = 0;
+    virtual void refreshPage(bool bFromCache) = 0;
+    virtual void quitApp() = 0;
+    virtual void minimizeApp() = 0;
+    virtual void restoreApp() = 0;
+    virtual void resizeBrowserWindow(RECT rc) = 0;
+    virtual void zoomPage(float fZoom) = 0;
+    virtual void zoomText(int nZoom) = 0;
+    virtual int getTextZoom() = 0; //Enum (0 to 4)
+    virtual StringW getPageTitle(UINT iTab) = 0;
+
+    virtual StringW getConfigPath() = 0;
 };
 
 class CExtManager : public IRhoExtManager
@@ -70,18 +100,43 @@ public:
     void registerExtension(const String& strName, IRhoExtension* pExt);
 
     IRhoExtension* getExtByName(const String& strName);
-    void onBeforeNavigate();
+
+    void onSetPropertiesData( const wchar_t* pPropID, const wchar_t* pData);
+    void onBeforeNavigate(const wchar_t* szUrlBeingNavigatedTo);
+    void onNavigateComplete(const wchar_t* szUrlBeingNavigatedTo);
+    void onDocumentComplete(const wchar_t* szUrlOfDocument);
+    bool onWndMsg(MSG& oMsg);
+    long OnNavigateTimeout(const wchar_t* szUrlBeingNavigatedTo);
+    long OnSIPState(bool bSIPState);
+    long OnAlertPopup(int nEnum, void* pData);
+    long OnNavigateError(const wchar_t* szUrlBeingNavigatedTo);
+    void OnAppActivate(bool bActivate);
 
     CRhoExtData makeExtData();
     void close();
 
     //IRhoExtManager
     virtual void onUnhandledProperty( const wchar_t* pModuleName, const wchar_t* pName, const wchar_t* pValue, const CRhoExtData& oExtData );
-    virtual void executeRuby( const char* szMethod, const char* szParam);
-    virtual void executeRubyCallback( const char* szCallback, const char* szCallbackBody, const char* szCallbackData);
+    virtual void executeRubyCallback( const char* szCallback, const char* szCallbackBody, const char* szCallbackData, bool bWaitForResponse);
     virtual void navigate(const wchar_t* szUrl);
     virtual void requireRubyFile( const char* szFilePath );
-
+    virtual void executeJavascript(const wchar_t* szJSFunction);
+    virtual bool existsJavascript(const wchar_t* szJSFunction);
+    virtual void rhoLog(int nSeverity, const char* szModule, const char* szMsg, const char* szFile, int nLine);
+    virtual StringW getCurrentUrl();
+    virtual void stopNavigate();
+    virtual void historyForward();
+    virtual void historyBack();
+    virtual void refreshPage(bool bFromCache);
+    virtual void quitApp();
+    virtual void minimizeApp();
+    virtual void restoreApp();
+    virtual void resizeBrowserWindow(RECT rc);
+    virtual void zoomPage(float fZoom);
+    virtual void zoomText(int nZoom);
+    virtual int getTextZoom(); //Enum (0 to 4)
+    virtual StringW getPageTitle(UINT iTab);
+    virtual StringW getConfigPath();
 };
 
 } //namespace common

data/platform/shared/common/RhoSimConf.h

@@ -36,6 +36,7 @@ class RhoSimSettings : public RhoSettings
 {
 public:
     const String& getRhodesPath(){return getString("rhodes_path");}
+    const String& getRhoRuntimePath(){return getString("rhodes_path");}
 };
 
 extern RhoSimSettings g_RhoSimSettings;

data/platform/shared/common/RhodesApp.cpp

@@ -105,6 +105,7 @@ private:
     void processCommand(IQueueCommand* pCmd);
 
     static char const *toString(int type);
+    void   callCallback(const String& strCallback);
 
 private:
     callback_t m_expected;
@@ -149,6 +150,41 @@ void CAppCallbacksQueue::call(CAppCallbacksQueue::callback_t type)
     addQueueCommand(new Command(type));
 }*/
 
+void CAppCallbacksQueue::callCallback(const String& strCallback)
+{
+    String strUrl = RHODESAPP().getBaseUrl();
+    strUrl += strCallback;
+    NetResponse resp = getNetRequest().pullData( strUrl, null );
+    if ( !resp.isOK() )
+    {
+        boolean bTryAgain = false;
+#if defined( __SYMBIAN32__ ) || defined( OS_ANDROID )
+        if ( String_startsWith( strUrl, "http://localhost:" ) )
+        {
+            RHODESAPP().setBaseUrl("http://127.0.0.1:");
+            bTryAgain = true;
+        }
+#else
+        if ( String_startsWith( strUrl, "http://127.0.0.1:" ) )
+        {
+            RHODESAPP().setBaseUrl("http://localhost:");
+            bTryAgain = true;
+        }
+#endif
+
+        if ( bTryAgain )
+        {
+            LOG(INFO) + "Change base url and try again.";
+            strUrl = RHODESAPP().getBaseUrl();
+            strUrl += strCallback;
+            resp = getNetRequest().pullData( strUrl, null );
+        }
+
+        if ( !resp.isOK() )
+            LOG(ERROR) + strCallback + " call failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData();
+    }
+}
+
 void CAppCallbacksQueue::processCommand(IQueueCommand* pCmd)
 {
     Command *cmd = (Command *)pCmd;
@@ -234,23 +270,13 @@ void CAppCallbacksQueue::processCommand(IQueueCommand* pCmd)
             break;
         case ui_created:
             {
-                String strUrl = RHODESAPP().getBaseUrl();
-                strUrl += "/system/uicreated";
-                NetResponse resp = getNetRequest().pullData( strUrl, null );
-                if ( !resp.isOK() )
-                    LOG(ERROR) + "activate app failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData();
-
+                callCallback("/system/uicreated");
                 m_expected = app_activated;
             }
             break;
         case app_activated:
             {
-                String strUrl = RHODESAPP().getBaseUrl();
-                strUrl += "/system/activateapp";
-                NetResponse resp = getNetRequest().pullData( strUrl, null );
-                if ( !resp.isOK() )
-                    LOG(ERROR) + "activate app failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData();
-
+                callCallback("/system/activateapp");
                 m_expected = app_deactivated;
             }
             break;
@@ -261,12 +287,12 @@ void CAppCallbacksQueue::processCommand(IQueueCommand* pCmd)
     m_commands.clear();
 }
 
-/*static*/ CRhodesApp* CRhodesApp::Create(const String& strRootPath, const String& strUserPath)
+/*static*/ CRhodesApp* CRhodesApp::Create(const String& strRootPath, const String& strUserPath, const String& strRuntimePath)
 {
     if ( m_pInstance != null) 
         return (CRhodesApp*)m_pInstance;
 
-    m_pInstance = new CRhodesApp(strRootPath, strUserPath);
+    m_pInstance = new CRhodesApp(strRootPath, strUserPath, strRuntimePath);
 
     String push_pin = RHOCONF().getString("push_pin");
     if(!push_pin.empty())
@@ -286,14 +312,15 @@ void CAppCallbacksQueue::processCommand(IQueueCommand* pCmd)
 
 }
 
-CRhodesApp::CRhodesApp(const String& strRootPath, const String& strUserPath)
-    :CRhodesAppBase(strRootPath, strUserPath)
+CRhodesApp::CRhodesApp(const String& strRootPath, const String& strUserPath, const String& strRuntimePath)
+    :CRhodesAppBase(strRootPath, strUserPath, strRuntimePath)
 {
     m_bExit = false;
     m_bDeactivationMode = false;
     m_bRestartServer = false;
     m_bSendingLog = false;
     //m_activateCounter = 0;
+    m_pExtManager = 0;
 
     m_appCallbacksQueue = new CAppCallbacksQueue();
 
@@ -591,6 +618,26 @@ void CRhodesApp::callBarcodeCallback(String strCallbackUrl, const String& strBar
     runCallbackInThread(strCallbackUrl, strBody);
 }
 
+void CRhodesApp::callCallbackWithData(String strCallbackUrl, String strBody, const String& strCallbackData, bool bWaitForResponse) 
+{
+    strCallbackUrl = canonicalizeRhoUrl(strCallbackUrl);
+
+    strBody += "&rho_callback=1";
+
+    if (strCallbackData.length() > 0 )
+    {
+        if ( !String_startsWith( strCallbackData, "&" ) )
+            strBody += "&";
+
+        strBody += strCallbackData;
+    }
+
+    if (bWaitForResponse)
+        getNetRequest().pushData( strCallbackUrl, strBody, null );
+    else
+        runCallbackInThread(strCallbackUrl, strBody);
+}
+
 void CRhodesApp::callCameraCallback(String strCallbackUrl, const String& strImagePath, 
     const String& strError, boolean bCancel ) 
 {
@@ -780,11 +827,12 @@ void CRhodesApp::initHttpServer()
 {
     String strAppRootPath = getRhoRootPath();
     String strAppUserPath = getRhoUserPath();
+    String strRuntimePath = getRhoRuntimePath();
 #ifndef RHODES_EMULATOR
     strAppRootPath += "apps";
 #endif
 
-    m_httpServer = new net::CHttpServer(atoi(getFreeListeningPort()), strAppRootPath, strAppUserPath);
+    m_httpServer = new net::CHttpServer(atoi(getFreeListeningPort()), strAppRootPath, strAppUserPath, strRuntimePath);
     m_httpServer->register_uri("/system/geolocation", rubyext::CGeoLocation::callback_geolocation);
     m_httpServer->register_uri("/system/syncdb", callback_syncdb);
     m_httpServer->register_uri("/system/redirect_to", callback_redirect_to);
@@ -1084,6 +1132,11 @@ const String& CRhodesApp::getBaseUrl()
     return m_strHomeUrl;
 }
 
+void CRhodesApp::setBaseUrl(const String& strBaseUrl)
+{
+    m_strHomeUrl = strBaseUrl + getFreeListeningPort();
+}
+
 const String& CRhodesApp::getOptionsUrl()
 {
     m_strOptionsUrl = canonicalizeRhoUrl( RHOCONF().getString("options_path") );
@@ -1416,12 +1469,17 @@ int	rho_http_snprintf(char *buf, size_t buflen, const char *fmt, ...)
 	
 void rho_rhodesapp_create(const char* szRootPath)
 {
-    rho::common::CRhodesApp::Create(szRootPath, szRootPath);
+    rho::common::CRhodesApp::Create(szRootPath, szRootPath, szRootPath);
 }
 
 void rho_rhodesapp_create_with_separate_user_path(const char* szRootPath, const char* szUserPath)
 {
-    rho::common::CRhodesApp::Create(szRootPath, szUserPath);
+    rho::common::CRhodesApp::Create(szRootPath, szUserPath, szRootPath);
+}
+
+void rho_rhodesapp_create_with_separate_runtime(const char* szRootPath, const char* szRuntimePath)
+{
+    rho::common::CRhodesApp::Create(szRootPath, szRootPath, szRuntimePath);
 }
     
     
@@ -1670,12 +1728,3 @@ int rho_rhodesapp_canstartapp(const char* szCmdLine, const char* szSeparators)
 }
 
 } //extern "C"
-
-
-
-
-
-
-
-
-