rhodes 1.5.5 → 2.0.0.beta1

data/platform/shared/rubyJVM/src/com/rho/net/RhoConnection.java

@@ -18,6 +18,7 @@ import com.xruby.runtime.lang.RhoSupport;
 import com.rho.net.URI;
 import com.rho.sync.SyncThread;
 import com.rho.*;
+import com.rho.file.SimpleFile;
 
 public class RhoConnection implements IHttpConnection {
 
@@ -26,7 +27,7 @@ public class RhoConnection implements IHttpConnection {
 	
 	/** Request URI **/
 	URI uri;
-	URI uri_external;
+	String  url_external;
 	
 	/** Method - GET, POST, HEAD **/
 	String method;
@@ -49,9 +50,10 @@ public class RhoConnection implements IHttpConnection {
 	
 	/** Construct connection using URI **/
     
-    public RhoConnection(URI _uri) {
-    	uri = new URI(_uri.toString());
-    	uri_external = _uri;
+    public RhoConnection(URI _uri) 
+    {
+    	url_external = _uri.toString();
+    	uri = new URI(url_external);
     
     	if ( !uri.getPath().startsWith("/apps") )
     		uri.setPath("/apps" + uri.getPath());
@@ -59,6 +61,52 @@ public class RhoConnection implements IHttpConnection {
     		uri.setPath(uri.getPath());
     }
     
+    public void resetUrl(String url)
+    {
+    	url_external = url;
+    	uri = new URI(url_external);
+    
+    	if ( !uri.getPath().startsWith("/apps") )
+    		uri.setPath("/apps" + uri.getPath());
+    	else
+    		uri.setPath(uri.getPath());
+    	
+    	method = "";
+        responseCode = 200;
+        responseMsg = "OK";
+        contentLength = -1;
+        reqHeaders.clear();
+        resHeaders.clear();
+        requestProcessed = false;
+        
+        try{
+        	clean();
+        }catch(IOException exc)
+        {
+        	LOG.ERROR("clean failed.", exc);
+        }
+    }
+
+	private void clean() throws IOException 
+	{
+		if ( m_file != null ){
+			m_file.close();
+			m_file = null;
+		}else if (responseData != null)
+			responseData.close();
+		
+		responseData = null;
+		
+		if ( postData != null )
+			postData.close();
+	}
+	
+	public void close() throws IOException 
+	{
+		clean();
+		LOG.TRACE("Close browser connection.");
+	}
+    
 	public Object getNativeConnection() {
 		throw new RuntimeException("getNativeConnection - Not implemented");
 	}
@@ -193,8 +241,8 @@ public class RhoConnection implements IHttpConnection {
 	}
 
 	public String getURL() {
-		LOG.TRACE("getURL: " + uri_external.toString());
-		return uri_external.toString();
+		LOG.TRACE("getURL: " + url_external);
+		return url_external;
 	}
 
 	public void setRequestMethod(String method) throws IOException {
@@ -319,16 +367,6 @@ public class RhoConnection implements IHttpConnection {
 		return responseData;
 	}
 
-	public void close() throws IOException {
-		if ( m_file != null ){
-			m_file.close();
-			m_file = null;
-		}else if (responseData != null)
-			responseData.close();
-		
-		responseData = null;
-	}
-
 	public DataOutputStream openDataOutputStream() throws IOException {
 		return new DataOutputStream(postData);
 	}
@@ -498,23 +536,38 @@ public class RhoConnection implements IHttpConnection {
 		return strTime;
 	}
 	
-	protected boolean httpServeFile(String strContType)throws IOException{
-		
+	protected boolean isDbFilesPath(String strPath)
+	{
+		return strPath.startsWith("/apps/app/db/db-files") || strPath.startsWith("/apps/db/db-files");
+	}
+	
+	protected boolean httpServeFile(String strContType)throws IOException
+	{
 		String strPath = uri.getPath();
 		//if ( !strPath.startsWith("/apps") )
 		//	strPath = "/apps" + strPath; 
 
-		LOG.INFO("httpServeFile: " + strPath);
-		if ( strContType.equals("application/javascript")){
-			responseData = RhoRuby.loadFile(strPath);
-			if ( responseData == null ){
-				String str = "";
-				responseData = new ByteArrayInputStream(str.getBytes());
+		LOG.TRACE("httpServeFile: " + strPath);
+		
+		if ( !isDbFilesPath(strPath) )
+		{
+			if ( strContType.equals("application/javascript")){
+				responseData = RhoRuby.loadFile(strPath);
+				if ( responseData == null ){
+					String str = "";
+					responseData = new ByteArrayInputStream(str.getBytes());
+				}
 			}
+			else	
+				responseData = RhoRuby.loadFile(strPath);
+		}else
+		{
+			if ( strPath.startsWith("/apps/app/db/db-files") )
+				strPath = strPath.substring(9);// remove /apps/app
+			else
+				strPath = strPath.substring(5);// remove /apps
 		}
-		else	
-			responseData = RhoRuby.loadFile(strPath);
-
+		
 		if (responseData == null){
 			  
 			SimpleFile file = null;
@@ -555,9 +608,22 @@ public class RhoConnection implements IHttpConnection {
 		return true;
 	}
 	
-	protected boolean httpGetFile(String strContType)throws IOException{
+	private boolean isKnownExtension(String strPath)
+	{
+		int nDot = strPath.lastIndexOf('.');
+		if ( nDot >= 0 )
+		{
+			String strExt = strPath.substring(nDot+1);
+			return strExt.equalsIgnoreCase("png") || strExt.equalsIgnoreCase("jpg") ||
+				strExt.equalsIgnoreCase("css") || strExt.equalsIgnoreCase("js");
+		}
 		
-		if ( strContType.length() == 0 )
+		return false;
+	}
+	
+	protected boolean httpGetFile(String strContType)throws IOException
+	{
+		if ( !isDbFilesPath(uri.getPath()) && !isKnownExtension(uri.getPath()) && strContType.length() == 0 )
 		{
 			String strTemp = FilePath.join(uri.getPath(), "/");
 	
@@ -588,7 +654,11 @@ public class RhoConnection implements IHttpConnection {
 			if ( model.equalsIgnoreCase("geolocation") ){
 				showGeoLocation();
 				return true;
+			}else if ( model.equalsIgnoreCase("loadserversources") ){
+				RhoRuby.loadserversources(postData.toString());
+				return true;
 			}
+
 		}else if ( application.equalsIgnoreCase("shared") )
 			return false;
 		
@@ -700,7 +770,7 @@ public class RhoConnection implements IHttpConnection {
 		if (!requestProcessed) {
 			String strErr = "";
 			
-			LOG.INFO("processRequest: " + getURL() );
+			LOG.TRACE("processRequest: " + getURL() );
 			
 			String strContType = getContentType();
 			if ( this.method.equals("POST") || strContType.length() == 0 )

data/platform/shared/rubyJVM/src/com/rho/net/URI.java

@@ -1,7 +1,6 @@
 package com.rho.net;
 
 import com.rho.Tokenizer;
-import com.rho.net.NetRequest.ParsedCookie;
 
  public class URI {
 

data/platform/shared/rubyJVM/src/com/rho/sync/ClientRegister.java

@@ -9,6 +9,7 @@ import com.rho.RhoThread;
 import com.rho.db.IDBResult;
 import com.rho.net.NetRequest;
 import com.rho.net.NetResponse;
+import com.rho.db.DBAdapter;
 
 public class ClientRegister extends RhoThread 
 {
@@ -16,13 +17,15 @@ public class ClientRegister extends RhoThread
 		new RhoLogger("ClientRegister");
 	
 	private static final int WAIT_BEFOREKILL_SECONDS  = 3;
-	private static final int POLL_INTERVAL_SECONDS = 30*60;
+	private static final int POLL_INTERVAL_SECONDS = 60;
+	private static final int POLL_INTERVAL_INFINITE = Integer.MAX_VALUE/1000;	
     public static final int DEFAULT_PUSH_PORT = 100;
 
 	static ClientRegister m_pInstance;
 	IRhoRubyHelper 	m_sysInfo;
 	NetRequest      m_NetRequest;
     String          m_strDevicePin;
+    int             m_nPollInterval;
     
     private NetRequest getNet() { return m_NetRequest;}
     
@@ -50,9 +53,10 @@ public class ClientRegister extends RhoThread
 		m_sysInfo = RhoClassFactory.createRhoRubyHelper();
 		m_strDevicePin = m_sysInfo.getDeviceId();
 		m_NetRequest = RhoClassFactory.createNetRequest();
+		m_nPollInterval = POLL_INTERVAL_SECONDS;
 		
-		//send client register request in login
-		//start(epLow);
+		if ( RhoConf.getInstance().getString("syncserver").length() > 0 )
+			start(epLow);	
 	}
 	
 	public static ClientRegister getInstance(){ return m_pInstance; }
@@ -75,35 +79,36 @@ public class ClientRegister extends RhoThread
     			LOG.ERROR("doRegister failed", exc);
     		}
     		
-			LOG.INFO("Waiting for "+ POLL_INTERVAL_SECONDS+ " sec to try again to register client");
-			wait(POLL_INTERVAL_SECONDS);
+			LOG.INFO("Waiting for "+ m_nPollInterval+ " sec to try again to register client");
+			wait(m_nPollInterval);
 		}
         LOG.INFO( "ClientRegister thread shutdown" );
     	
     }
 
-    public String getRegisterBody()throws Exception
+    public String getRegisterBody(String strClientID)throws Exception
     {
 		int port = RhoConf.getInstance().getInt("push_port");
-    	
-		String strBody = "device_pin=" + m_strDevicePin + 
-			"&device_port=" + (port > 0 ? port : DEFAULT_PUSH_PORT) +
-			"&device_type=" + m_sysInfo.getPlatform();
-    	
-		return strBody;
+
+        return SyncThread.getSyncEngine().getProtocol().getClientRegisterBody( strClientID, m_strDevicePin, 
+            port > 0 ? port : DEFAULT_PUSH_PORT, m_sysInfo.getPlatform());
     }
     
     private boolean doRegister(	SyncEngine oSync )throws Exception
     {
     	String session = oSync.loadSession();
     	if ( session == null || session.length() == 0 )
+    	{
+    		m_nPollInterval = POLL_INTERVAL_INFINITE;    		
     		return false;
+    	}
+		m_nPollInterval = POLL_INTERVAL_SECONDS;    		
     	
 		String client_id = oSync.loadClientID();
 		if ( client_id == null || client_id.length() == 0 )
 			return false;
     	
-		IDBResult res = oSync.getDB().executeSQL("SELECT token,token_sent from client_info");
+		IDBResult res = DBAdapter.getUserDB().executeSQL("SELECT token,token_sent from client_info");
         if ( !res.isEnd() ) {
 			String token = res.getStringByIdx(0); 
 			int token_sent = res.getIntByIdx(1);
@@ -114,28 +119,20 @@ public class ClientRegister extends RhoThread
 				return true; 
 			}
         }
-		
-		String serverUrl = RhoConf.getInstance().getPath("syncserver");
-		if (serverUrl != null && serverUrl.length()>0) 
+
+	    String strBody = getRegisterBody(client_id);
+        NetResponse resp = getNet().pushData( oSync.getProtocol().getClientRegisterUrl(), strBody, oSync );
+		if( resp.isOK() ) 
 		{
-			String strBody = getRegisterBody();
-	    	strBody += "&client_id=" + client_id;
-			
-			NetResponse resp = getNet().pushData(serverUrl+"clientregister", strBody, oSync);
-			if( resp.isOK() ) 
-			{
-				try {
-					oSync.getDB().executeSQL("UPDATE client_info SET token_sent=?, token=?", new Integer(1), m_strDevicePin );
-				} catch(Exception ex) {
-					LOG.ERROR("Error saving token_sent to the DB...");
-				}	
-				LOG.INFO("Registered client sucessfully...");
-				return true;
-			} else {
-				LOG.INFO("Network error POST-ing device pin to the server...");
-			}
+			try {
+				DBAdapter.getUserDB().executeSQL("UPDATE client_info SET token_sent=?, token=?", new Integer(1), m_strDevicePin );
+			} catch(Exception ex) {
+				LOG.ERROR("Error saving token_sent to the DB...");
+			}	
+			LOG.INFO("Registered client sucessfully...");
+			return true;
 		} else {
-			LOG.INFO("Can't register client because syncserver url is not configured...");
+			LOG.INFO("Network error POST-ing device pin to the server...");
 		}
 		
 		return false;

data/platform/shared/rubyJVM/src/com/rho/sync/ISyncProtocol.java

@@ -0,0 +1,20 @@
+package com.rho.sync;
+public interface ISyncProtocol
+{
+    public abstract String getContentType();
+    public abstract int getVersion();
+
+    public abstract String getLoginUrl();
+    public abstract String getLoginBody( String name, String password);
+    public abstract String getClientCreateUrl();
+
+    public abstract String getClientRegisterUrl();
+    public abstract String getClientRegisterBody( String strClientID, String strPin, int nPort, String strType );
+
+    public abstract String getClientResetUrl(String strClientID);
+    public abstract String getClientChangesUrl();
+
+    public abstract String getServerQueryUrl(String strAction);
+    public abstract String getServerQueryBody(String strSrcName, String strClientID, int nPageSize );
+
+}

data/platform/shared/rubyJVM/src/com/rho/sync/JSONEntry.java

@@ -35,6 +35,11 @@ class JSONEntry
 	    return szRes;
 	}
 
+	String getString()
+	{
+		return m_object.toString();
+	}
+	
 	int getInt(String name)throws JSONException
 	{
 	    int nRes = 0;

data/platform/shared/rubyJVM/src/com/rho/sync/JSONStructIterator.java

@@ -0,0 +1,74 @@
+package com.rho.sync;
+
+import org.json.me.JSONException;
+import org.json.me.JSONObject;
+import java.util.Enumeration;
+class JSONStructIterator
+{
+	JSONObject m_object;
+	Enumeration m_enumKeys;
+	String m_strCurKey;
+	
+    JSONStructIterator(String szData)throws JSONException
+    {
+    	m_object = new JSONObject(szData);
+    	m_enumKeys = m_object.keys();
+    	if ( m_enumKeys != null && m_enumKeys.hasMoreElements() )
+    		m_strCurKey = (String)m_enumKeys.nextElement();
+    }
+
+    JSONStructIterator(JSONEntry oEntry, String strName)throws JSONException
+    {
+    	m_object = (JSONObject)oEntry.m_object.get(strName);
+    	m_enumKeys = m_object.keys();
+    	if ( m_enumKeys != null && m_enumKeys.hasMoreElements() )
+    		m_strCurKey = (String)m_enumKeys.nextElement();
+    }
+
+    JSONStructIterator(JSONEntry oEntry)
+    {
+    	m_object = oEntry.m_object;
+    	m_enumKeys = m_object.keys();
+    	if ( m_enumKeys != null && m_enumKeys.hasMoreElements() )
+    		m_strCurKey = (String)m_enumKeys.nextElement();
+    }
+
+    boolean isEnd()
+    {
+        return m_strCurKey == null;
+    }
+
+    void  next()
+    {
+    	if ( m_enumKeys != null && m_enumKeys.hasMoreElements() )
+    		m_strCurKey = (String)m_enumKeys.nextElement();
+    	else
+    		m_strCurKey = null;
+    }
+
+    void reset()
+    {
+    	m_enumKeys = m_object.keys();
+    	if ( !isEnd() )
+    		m_strCurKey = (String)m_enumKeys.nextElement();
+    }
+
+    String getCurKey()
+    {
+        return isEnd() ? new String() : m_strCurKey;
+    }
+
+	String getCurString()throws JSONException
+	{
+		return m_object.getString(m_strCurKey);
+	}
+    
+    JSONEntry getCurValue()throws JSONException
+    {
+    	if ( isEnd() )
+    		return new JSONEntry( (JSONObject)null );
+    	
+		return new JSONEntry( (JSONObject)m_object.getJSONObject(m_strCurKey) );
+    }
+
+}

data/platform/shared/rubyJVM/src/com/rho/sync/SyncEngine.java

@@ -39,24 +39,20 @@ public class SyncEngine implements NetRequest.IRhoSession
 	private static final RhoProfiler PROF = RhoProfiler.RHO_STRIP_PROFILER ? new RhoEmptyProfiler() : 
 		new RhoProfiler();
 	
-    public static final int esNone = 0, esSyncAllSources = 1, esSyncSource = 2, esStop = 3, esExit = 4;
+    public static final int esNone = 0, esSyncAllSources = 1, esSyncSource = 2, esSearch=3, esStop = 4, esExit = 5;
 
-    static String SYNC_SOURCE_FORMAT() { return "?format=json"; }
-    int SYNC_VERSION() { return 2; }
-    static String SYNC_ASK_ACTION() { return "/ask"; }
-	
     static class SourceID
     {
         String m_strName = "";
-        String m_strUrl = "";
         int m_nID;
 
+        SourceID(int id, String strName ){ m_nID = id; m_strName = strName; }
+        SourceID(String strName ){ m_strName = strName; }
+        
         public String toString()
         {
             if ( m_strName.length() > 0 )
                 return "name : " + m_strName;
-            else if ( m_strUrl.length() > 0 )
-                return "url : " + m_strUrl;
 
             return "# : " + m_nID;
         }
@@ -64,22 +60,15 @@ public class SyncEngine implements NetRequest.IRhoSession
         {
             if ( m_strName.length() > 0 )
                 return src.getName().equals(m_strName);
-            else if ( m_strUrl.length() > 0 )
-            {
-            	URI uri1 = new URI(m_strUrl);
-            	URI uri2 = new URI(src.getUrl());
-            	
-            	return uri1.getPath().compareTo(uri2.getPath()) == 0;
-                //return src.getUrl().equals(m_strUrl);
-            }
-            
+
             return m_nID == src.getID().intValue();
         }
     };
     
     Vector/*<SyncSource*>*/ m_sources = new Vector();
-    DBAdapter   m_dbAdapter;
+    Vector/*<String>*/      m_arPartitions = new Vector();    
     NetRequest m_NetRequest;
+    ISyncProtocol m_SyncProtocol;
     int         m_syncState;
     String     m_clientID = "";
     Mutex m_mxLoadClientID = new Mutex();
@@ -87,6 +76,8 @@ public class SyncEngine implements NetRequest.IRhoSession
     SyncNotify m_oSyncNotify = new SyncNotify(this);
     boolean m_bStopByUser = false;
     int m_nSyncPageSize = 2000;
+    boolean m_bNoThreaded = false;
+    int m_nErrCode = RhoRuby.ERR_NONE;
     
     void setState(int eState){ m_syncState = eState; }
     int getState(){ return m_syncState; }
@@ -99,20 +90,31 @@ public class SyncEngine implements NetRequest.IRhoSession
     
     String getClientID(){ return m_clientID; }
     void setSession(String strSession){m_strSession=strSession;}
-    public String getSession(){ return m_strSession; }
     boolean isSessionExist(){ return m_strSession != null && m_strSession.length() > 0; }
-    DBAdapter getDB(){ return m_dbAdapter; }
+    
+    DBAdapter getUserDB(){ return DBAdapter.getUserDB(); }
+    DBAdapter getDB(String strPartition){ return DBAdapter.getDB(strPartition); }
+    
+  //IRhoSession
+    public String getSession(){ return m_strSession; }
+    public String getContentType(){ return getProtocol().getContentType();}
+    
     SyncNotify getNotify(){ return m_oSyncNotify; }
     NetRequest getNet() { return m_NetRequest;}
+    ISyncProtocol getProtocol(){ return m_SyncProtocol; }
     
-    SyncEngine(DBAdapter db){
-    	m_dbAdapter = db;
-
+    SyncEngine(){
 		m_NetRequest = null;
-    	m_syncState = esNone; 
+    	m_syncState = esNone;
+    	
+    	initProtocol();
     }
 
-    String SYNC_PAGE_SIZE(){ return Integer.toString(m_nSyncPageSize); }
+    void initProtocol()
+    {
+        m_SyncProtocol = new SyncProtocol_3();
+    }
+    
     int getSyncPageSize() { return m_nSyncPageSize; }
     void setSyncPageSize(int nPageSize){ m_nSyncPageSize = nPageSize; }
     
@@ -120,21 +122,48 @@ public class SyncEngine implements NetRequest.IRhoSession
 		m_NetRequest = RhoClassFactory.createNetRequest();
     }
     
-	void doSyncAllSources()
-	{
-		LOG.INFO("Sync all sources started.");
-	    setState(esSyncAllSources);
-	    m_bStopByUser = false;
-	    
+    void prepareSync(int eState)throws Exception
+    {
+        setState(eState);
+        m_bStopByUser = false;
+        m_nErrCode = RhoRuby.ERR_NONE;
+        
+        loadAllSources();
+
+        m_strSession = loadSession();
+        if ( isSessionExist()  )
+        {
+            m_clientID = loadClientID();
+            if ( m_nErrCode == RhoRuby.ERR_NONE )
+            {
+                getNotify().cleanLastSyncObjectCount();
+       	        doBulkSync();
+
+                return;
+            }
+        }else
+            m_nErrCode = RhoRuby.ERR_CLIENTISNOTLOGGEDIN;
+        
+    	if ( m_sources.size() > 0 )
+        {		    	
+	    	SyncSource src = (SyncSource)m_sources.elementAt(getStartSource());
+	    	src.m_nErrCode = m_nErrCode;
+	    	
+	    	getNotify().fireSyncNotification(src, true, src.m_nErrCode, "");
+        }else
+        	getNotify().fireSyncNotification(null, true, m_nErrCode, "");
+
+        stopSync();
+    }
+    
+    void doSyncAllSources()
+    {
 	    try
 	    {
-		    loadAllSources();
-		
-		    m_strSession = loadSession();
-		    if ( isSessionExist()  ) {
-		    	m_clientID = loadClientID();
-			    getNotify().cleanLastSyncObjectCount();
-
+	        prepareSync(esSyncAllSources);
+	
+	        if ( isContinueSync() )
+	        {
 			    PROF.CREATE_COUNTER("Net");	    
 			    PROF.CREATE_COUNTER("Parse");
 			    PROF.CREATE_COUNTER("DB");
@@ -142,9 +171,9 @@ public class SyncEngine implements NetRequest.IRhoSession
 			    PROF.CREATE_COUNTER("Data1");
 			    PROF.CREATE_COUNTER("Pull");
 			    PROF.START("Sync");
-		    	
-			    syncAllSources();
-
+	
+	            syncAllSources();
+	
 			    PROF.DESTROY_COUNTER("Net");	    
 			    PROF.DESTROY_COUNTER("Parse");
 			    PROF.DESTROY_COUNTER("DB");
@@ -152,99 +181,189 @@ public class SyncEngine implements NetRequest.IRhoSession
 			    PROF.DESTROY_COUNTER("Data1");
 			    PROF.DESTROY_COUNTER("Pull");
 			    PROF.STOP("Sync");
-		    } else {
-		    	if ( m_sources.size() > 0 )
-		        {		    	
-			    	SyncSource src = (SyncSource)m_sources.elementAt(getStartSource());
-			    	//src.m_strError = "Client is not logged in. No sync will be performed.";
-			    	src.m_nErrCode = RhoRuby.ERR_CLIENTISNOTLOGGEDIN;
-			    	
-			    	getNotify().fireSyncNotification(src, true, src.m_nErrCode, "");
-		        }else
-		        	getNotify().fireSyncNotification(null, true, RhoRuby.ERR_CLIENTISNOTLOGGEDIN, "");
-		    }
-		    
+	        }
+	
+	        getNotify().cleanCreateObjectErrors();
 	    }catch(Exception exc)
 	    {
 	    	LOG.ERROR("Sync failed.", exc);
 	    }
-	    
-	    if ( getState() != esExit )
-	    	setState(esNone);
-	}
 
-	void doSyncSource(SourceID oSrcID, String strParams, String strAction, boolean bSearchSyncChanges,
-			int nProgressStep)
-	{
-	    setState(esSyncSource);
-	    m_bStopByUser = false;
+        if ( getState() != esExit )
+            setState(esNone);
+    }
+
+    void doSearch(Vector/*<rho::String>*/ arSources, String strParams, String strAction, boolean bSearchSyncChanges, int nProgressStep)
+    {
+/*        prepareSync(esSearch);
+        if ( !isContinueSync() )
+        {
+            if ( getState() != esExit )
+                setState(esNone);
+
+            return;
+        }
+
+        CTimeInterval startTime = CTimeInterval::getCurrentTime();
+
+        if ( bSearchSyncChanges )
+        {
+            for ( int i = 0; i < (int)arSources.size(); i++ )
+            {
+                CSyncSource* pSrc = findSourceByName(arSources.elementAt(i));
+                if ( pSrc != null )
+                    pSrc->syncClientChanges();
+            }
+        }
+
+        int nErrCode = 0;
+        while( isContinueSync() )
+        {
+            int nSearchCount = 0;
+            String strUrl = getProtocol().getServerQueryUrl(strAction);
+            String strQuery = getProtocol().getServerQueryBody("", getClientID(), getSyncPageSize());
+
+            if ( strParams.length() > 0 )
+                strQuery += strParams;
+
+            for ( int i = 0; i < (int)arSources.size(); i++ )
+            {
+                CSyncSource* pSrc = findSourceByName(arSources.elementAt(i));
+                if ( pSrc != null )
+                {
+                    strQuery += "&sources[][name]=" + pSrc->getName();
+
+                    if ( !pSrc->isTokenFromDB() && pSrc->getToken() > 1 )
+                        strQuery += "&sources[][token]=" + convertToStringA(pSrc->getToken());
+                }
+            }
+
+    		LOG(INFO) + "Call search on server. Url: " + (strUrl+strQuery);
+            NetResponse(resp,getNet().pullData(strUrl+strQuery, this));
+
+            if ( !resp.isOK() )
+            {
+                stopSync();
+                nErrCode = RhoRuby.getErrorFromResponse(resp);
+                continue;
+            }
+
+            const char* szData = resp.getCharData();
+
+            CJSONArrayIterator oJsonArr(szData);
+
+            for( ; !oJsonArr.isEnd() && isContinueSync(); oJsonArr.next() )
+            {
+                CJSONArrayIterator oSrcArr(oJsonArr.getCurItem());
+
+                int nVersion = 0;
+                if ( !oSrcArr.isEnd() && oSrcArr.getCurItem().hasName("version") )
+                {
+                    nVersion = oSrcArr.getCurItem().getInt("version");
+                    oJsonArr.next();
+                }
+
+                if ( nVersion != getProtocol().getVersion() )
+                {
+                    LOG(ERROR) + "Sync server send search data with incompatible version. Client version: " + convertToStringA(getProtocol().getVersion()) +
+                        "; Server response version: " + convertToStringA(nVersion);
+                    stopSync();
+                    nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
+                    continue;
+                }
+
+                if ( !oSrcArr.getCurItem().hasName("source") )
+                {
+                    LOG(ERROR) + "Sync server send search data without source name.";
+                    stopSync();
+                    nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
+                    continue;
+                }
+
+                String strSrcName = oSrcArr.getCurItem().getString("source");
+                CSyncSource* pSrc = findSourceByName(strSrcName);
+                if ( pSrc == null )
+                {
+                    LOG(ERROR) + "Sync server send search data for unknown source name:" + strSrcName;
+                    stopSync();
+                    nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
+                    continue;
+                }
+
+                oSrcArr.reset(0);
+                pSrc->m_bIsSearch = true;
+                pSrc->setProgressStep(nProgressStep);
+                pSrc->processServerResponse_ver3(oSrcArr);
+
+                nSearchCount += pSrc->getCurPageCount();
+            }
+
+            if ( nSearchCount == 0 )
+                break;
+        }  
+
+        if ( isContinueSync() )
+        	getNotify().fireSyncNotification(null, true, RhoRuby.ERR_NONE, RhoRuby.getMessageText("sync_completed"));
+        else if ( nErrCode != 0 )
+        {
+            CSyncSource& src = *m_sources.elementAt(getStartSource());
+            src.m_nErrCode = nErrCode;
+            src.m_bIsSearch = true;
+            getNotify().fireSyncNotification(&src, true, src.m_nErrCode, "");
+        }
+
+        //update db info
+        CTimeInterval endTime = CTimeInterval::getCurrentTime();
+        unsigned long timeUpdated = CLocalTime().toULong();
+        for ( int i = 0; i < (int)arSources.size(); i++ )
+        {
+            CSyncSource* pSrc = findSourceByName(arSources.elementAt(i));
+            if ( pSrc == null )
+                continue;
+            CSyncSource& oSrc = *pSrc;
+            oSrc.getDB().executeSQL("UPDATE sources set last_updated=?,last_inserted_size=?,last_deleted_size=?, \
+    						 last_sync_duration=?,last_sync_success=?, backend_refresh_time=? WHERE source_id=?", 
+                             timeUpdated, oSrc.getInsertedCount(), oSrc.getDeletedCount(), 
+                             (endTime-startTime).toULong(), oSrc.getGetAtLeastOnePage(), oSrc.getRefreshTime(),
+                             oSrc.getID() );
+        }
+        //
+
+        getNotify().cleanCreateObjectErrors();
+        if ( getState() != esExit )
+            setState(esNone);*/
+    }
+
+    void doSyncSource(SourceID oSrcID)
+    {
         SyncSource src = null;
 
 	    try
 	    {
-		    loadAllSources();
-		    src = findSource(oSrcID);
-		    
-	        if ( src != null )
+	        prepareSync(esSyncSource);
+	
+	        if ( isContinueSync() )
 	        {
-	            LOG.INFO("Started synchronization of the data source: " + src.getName() );
-	        	
-	        	src.m_strParams = strParams;
-	        	src.m_strAction = strAction;
-	        	src.m_bSearchSyncChanges = bSearchSyncChanges;
-	        	src.m_nProgressStep = nProgressStep;
-	        	if ( oSrcID.m_strUrl.length() != 0 )
-	        	{
-	        		try{
-		        		URI uri = new URI(oSrcID.m_strUrl);
-		        		src.setUrlParams(uri.getQueryString());
-		        		
-		        		if (uri.getScheme()!= null && uri.getScheme().length()>0)
-		        			src.setUrl(uri.getPathSpecificPart());
-	        		}catch(Exception exc)
-	        		{
-	        			LOG.ERROR("Malformed url when sync by url.", exc);
-	        		}
-	        	}
-	        	
-			    m_strSession = loadSession();
-			    if ( isSessionExist()  ) {
-			    	m_clientID = loadClientID();
-			        if ( getState() != esStop )
-			        {
-			        	getNotify().cleanLastSyncObjectCount();
-			        	
-					    PROF.CREATE_COUNTER("Net");	    
-					    PROF.CREATE_COUNTER("Parse");
-					    PROF.CREATE_COUNTER("DB");
-					    PROF.CREATE_COUNTER("Data");
-					    PROF.CREATE_COUNTER("Data1");
-					    PROF.CREATE_COUNTER("Pull");
-					    PROF.START("Sync");
-			        	
-			            src.sync();
-			            
-					    PROF.DESTROY_COUNTER("Net");	    
-					    PROF.DESTROY_COUNTER("Parse");
-					    PROF.DESTROY_COUNTER("DB");
-					    PROF.DESTROY_COUNTER("Data");
-					    PROF.DESTROY_COUNTER("Data1");
-					    PROF.DESTROY_COUNTER("Pull");
-					    PROF.STOP("Sync");
-			        }
-			    } else {
-			    	//src.m_strError = "Client is not logged in. No sync will be performed.";
-			    	src.m_nErrCode = RhoRuby.ERR_CLIENTISNOTLOGGEDIN;
-			    }
-		
-			    getNotify().fireSyncNotification(src, true, src.m_nErrCode, src.m_nErrCode == RhoRuby.ERR_NONE ? RhoRuby.getMessageText("sync_completed") : "");
-	        } else {
-	        	src = new SyncSource(this);
-		    	//src.m_strError = "Unknown sync source.";
-		    	src.m_nErrCode = RhoRuby.ERR_RUNTIME;
-	        	
-    	    	throw new RuntimeException("Sync one source : Unknown Source " + oSrcID.toString() );
+	        	src = findSource(oSrcID);
+	            if ( src != null )
+	            {
+		            LOG.INFO("Started synchronization of the data source: " + src.getName() );
+	
+	                src.sync();
+	
+				    getNotify().fireSyncNotification(src, true, src.m_nErrCode, src.m_nErrCode == RhoRuby.ERR_NONE ? RhoRuby.getMessageText("sync_completed") : "");
+	            }else
+	            {
+//                    LOG.ERROR( "Sync one source : Unknown Source " + oSrcID.toString() );
+	            
+		        	src = new SyncSource(this, getUserDB());
+			    	//src.m_strError = "Unknown sync source.";
+			    	src.m_nErrCode = RhoRuby.ERR_RUNTIME;
+		        	
+	    	    	throw new RuntimeException("Sync one source : Unknown Source " + oSrcID.toString() );
+	            }
 	        }
+	
 	    } catch(Exception exc) {
     		LOG.ERROR("Sync source " + oSrcID.toString() + " failed.", exc);
 	    	
@@ -253,11 +372,11 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    	
 	    	getNotify().fireSyncNotification(src, true, src.m_nErrCode, "" ); 
 	    }
-        
-	    getNotify().cleanCreateObjectErrors();
-	    if ( getState() != esExit )
-	    	setState(esNone);
-	}
+
+        getNotify().cleanCreateObjectErrors();
+        if ( getState() != esExit )
+            setState(esNone);
+    }
 
 	SyncSource findSource(SourceID oSrcID)
 	{
@@ -273,29 +392,27 @@ public class SyncEngine implements NetRequest.IRhoSession
 	
 	SyncSource findSourceByName(String strSrcName)
 	{
-	    SourceID oSrcID = new SourceID();
-	    oSrcID.m_strName = strSrcName;
-	    return findSource(oSrcID);
+		return findSource(new SourceID(strSrcName));		
 	}
 	
 	void loadAllSources()throws DBException
 	{
 	    m_sources.removeAllElements();
-	    IDBResult res = getDB().executeSQL("SELECT source_id,source_url,token,name from sources ORDER BY priority");
-	
+	    
+	    IDBResult res = getUserDB().executeSQL("SELECT source_id,sync_type,name, partition from sources ORDER BY priority");
 	    for ( ; !res.isEnd(); res.next() )
 	    { 
-	        String strDbUrl = res.getStringByIdx(1);
-	        if ( strDbUrl.length() == 0 )
-	        	continue;
+	        String strShouldSync = res.getStringByIdx(1);
+	        if ( strShouldSync.compareTo("none") == 0)
+	            continue;
+
+	        String strName = res.getStringByIdx(2);
+	        String strPartition = res.getStringByIdx(3);
 	        
-	        String strUrl = strDbUrl.startsWith("http") ? strDbUrl : FilePath.join(RhoConf.getInstance().getPath("syncserver"), strDbUrl);
-	        if ( strUrl.charAt(strUrl.length()-1) == '/' || strUrl.charAt(strUrl.length()-1) == '\\' )
-	        	strUrl = strUrl.substring(0, strUrl.length()-1);	        
+	        if ( m_arPartitions.indexOf(strPartition) < 0 )
+	        	m_arPartitions.addElement(strPartition);
 	        
-	        String name = res.getStringByIdx(3);
-	        if ( strUrl.length() > 0 )
-	            m_sources.addElement( new SyncSource( res.getIntByIdx(0), strUrl, name, res.getLongByIdx(2), this) );
+	        m_sources.addElement( new SyncSource( res.getIntByIdx(0), strName, strShouldSync, getDB(strPartition), this) );
 	    }
 	}
 
@@ -306,76 +423,236 @@ public class SyncEngine implements NetRequest.IRhoSession
 		synchronized( m_mxLoadClientID )
 		{
 		    boolean bResetClient = false;
-	        IDBResult res = getDB().executeSQL("SELECT client_id,reset from client_info");
-	        if ( !res.isEnd() )
-	        {
-	            clientID = res.getStringByIdx(0);
-	            bResetClient = res.getIntByIdx(1) > 0;
-	        }
+		    {
+		        IDBResult res = getUserDB().executeSQL("SELECT client_id,reset from client_info");
+		        if ( !res.isEnd() )
+		        {
+		            clientID = res.getStringByIdx(0);
+		            bResetClient = res.getIntByIdx(1) > 0;
+		        }
+		    }
 		    
 		    if ( clientID.length() == 0 )
 		    {
 		        clientID = requestClientIDByNet();
 		
-		        getDB().executeSQL("DELETE FROM client_info");
-		        getDB().executeSQL("INSERT INTO client_info (client_id) values (?)", clientID);
+	            IDBResult res = getUserDB().executeSQL("SELECT * FROM client_info");
+	            if ( !res.isEnd() )
+	            	getUserDB().executeSQL("UPDATE client_info SET client_id=?", clientID);
+	            else
+	            	getUserDB().executeSQL("INSERT INTO client_info (client_id) values (?)", clientID);
 		    }else if ( bResetClient )
 		    {
 		    	if ( !resetClientIDByNet(clientID) )
-		    	{
-			    	if ( m_sources.size() > 0 )
-			        {		    	
-				    	SyncSource src = (SyncSource)m_sources.elementAt(getStartSource());
-				    	src.m_nErrCode = RhoRuby.ERR_REMOTESERVER;
-				    	
-				    	getNotify().fireSyncNotification(src, true, src.m_nErrCode, "");
-			        }else
-			        	getNotify().fireSyncNotification(null, true, RhoRuby.ERR_REMOTESERVER, "");
-		    		
 		    		stopSync();
-		    	}
 		    	else
-		    		getDB().executeSQL("UPDATE client_info SET reset=? where client_id=?", new Integer(0), clientID );	    	
+		    		getUserDB().executeSQL("UPDATE client_info SET reset=? where client_id=?", new Integer(0), clientID );	    	
 		    }
-
 		}
 		
 		return clientID;
 	}
 
+	void processServerSources(String strSources)throws Exception
+	{
+	    if ( strSources.length() > 0 )
+	    {
+	        NetResponse resp = getNet().pushData( getNet().resolveUrl("/system/loadserversources"), strSources, null);
+	        loadAllSources();
+	        
+	        DBAdapter.initAttrManager();
+	    }
+	}
+	
 	boolean resetClientIDByNet(String strClientID)throws Exception
 	{
-	    String serverUrl = RhoConf.getInstance().getPath("syncserver");
-	    String strUrl = serverUrl + "clientreset";
-	    String strQuery = "?client_id=" + strClientID;
-	    strQuery += "&" + ClientRegister.getInstance().getRegisterBody();
+        String strBody = "";
+        //TODO: send client register info in client reset 
+//        if ( ClientRegister.getInstance() != null )
+//            strBody += ClientRegister.getInstance().getRegisterBody();
+
+	    NetResponse resp = getNet().pullData(getProtocol().getClientResetUrl(strClientID), this);
+/*	    
+	    processServerSources("{\"server_sources\":[{\"name\":\"Product\",\"partition\":\"application\",\"source_id\":\"2\",\"priority\":\"0\","+
+	    	    "\"schema_version\":\"7.0\",\"schema\":{"+
+	    	    "\"columns\":[\'brand\',\'created_at\',\'name\',\'price\',\'quantity\',\'sku\',\'updated_at\']"+
+	    	    "}}]}"); 
+*/	    				
+	    
+	    if ( !resp.isOK() )
+	    	m_nErrCode = RhoRuby.getErrorFromResponse(resp);
+	    else
+    	{
+    		processServerSources(resp.getCharData());
+    	}
 	    
-	    NetResponse resp = getNet().pullData(strUrl+strQuery, this);
 	    return resp.isOK();
 	}
-	
+
 	String requestClientIDByNet()throws Exception
 	{
-		LOG.INFO("Request clientID by Net.");
-		
-	    String serverUrl = RhoConf.getInstance().getPath("syncserver");
-	    String strUrl = serverUrl + "clientcreate";
-	    String strQuery = SYNC_SOURCE_FORMAT();
-	    strQuery += "&" + ClientRegister.getInstance().getRegisterBody();
-	    
-	    NetResponse resp = getNet().pullData(strUrl+strQuery, this);
+        String strBody = "";
+        //TODO: send client register info in client create 
+//        if ( ClientRegister.getInstance() != null )
+//            strBody += ClientRegister.getInstance().getRegisterBody();
+	
+	    NetResponse resp = getNet().pullData(getProtocol().getClientCreateUrl(), this);
 	    if ( resp.isOK() && resp.getCharData() != null )
 	    {
 	    	String szData = resp.getCharData();
+	    	
 	        JSONEntry oJsonEntry = new JSONEntry(szData);
 	
+	        if (oJsonEntry.hasName("server_sources") )
+	            processServerSources(szData);
+	        
 	        JSONEntry oJsonObject = oJsonEntry.getEntry("client");
 	        if ( !oJsonObject.isEmpty() )
 	            return oJsonObject.getString("client_id");
+	    }else
+	    {
+	    	m_nErrCode = RhoRuby.getErrorFromResponse(resp);
+	    	if ( m_nErrCode == RhoRuby.ERR_NONE )
+	    		m_nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
 	    }
 	
 	    return "";
 	}
+
+	void doBulkSync()throws Exception
+	{
+	    if ( !RhoConf.getInstance().isExist("bulksync_state") )
+	        return;
+		
+	    int nBulkSyncState = RhoConf.getInstance().getInt("bulksync_state");;
+	    if ( nBulkSyncState >= 1 || !isContinueSync() )
+	        return;
+
+		LOG.INFO("Bulk sync: start");
+		getNotify().fireBulkSyncNotification(false, "start", "", RhoRuby.ERR_NONE);
+		
+	    for (int i = 0; i < (int)m_arPartitions.size() && isContinueSync(); i++)
+	        loadBulkPartition( (String)m_arPartitions.elementAt(i));
+
+	    if (isContinueSync())
+	    {
+	    	RhoConf.getInstance().setInt("bulksync_state", 1, true);
+	        getNotify().fireBulkSyncNotification(true, "", "", RhoRuby.ERR_NONE);
+	    }
+	}
+
+	void loadBulkPartition(String strPartition )throws Exception
+	{
+		DBAdapter dbPartition = getDB(strPartition); 		
+	    String serverUrl = RhoConf.getInstance().getPath("syncserver");
+	    String strUrl = serverUrl + "bulk_data";
+	    String strQuery = "?client_id=" + m_clientID + "&partition=" + strPartition;
+	    String strDataUrl = "", strCmd = "";
+
+	    getNotify().fireBulkSyncNotification(false, "start", strPartition, RhoRuby.ERR_NONE);
+	    
+	    while(strCmd.length() == 0&&isContinueSync())
+	    {	    
+	        NetResponse resp = getNet().pullData(strUrl+strQuery, this);
+	        if ( !resp.isOK() || resp.getCharData() == null )
+	        {
+	    	    LOG.ERROR( "Bulk sync failed: server return an error." );
+	    	    stopSync();
+	    	    getNotify().fireBulkSyncNotification(true, "", strPartition, RhoRuby.ERR_REMOTESERVER);
+	    	    return;
+	        }
+
+		    LOG.INFO("Bulk sync: got response from server: " + resp.getCharData() );
+	    	
+	        String szData = resp.getCharData();
+	        JSONEntry oJsonEntry = new JSONEntry(szData);
+	        strCmd = oJsonEntry.getString("result");
+	        if ( oJsonEntry.hasName("url") )
+	   	        strDataUrl = oJsonEntry.getString("url");
+	        
+	        if ( strCmd.compareTo("wait") == 0)
+	        {
+	            int nTimeout = RhoConf.getInstance().getInt("bulksync_timeout_sec");
+	            if ( nTimeout == 0 )
+	                nTimeout = 5;
+
+	            SyncThread.getInstance().wait(nTimeout);
+	            strCmd = "";
+	        }
+	    }
+
+	    if ( strCmd.compareTo("nop") == 0)
+	    {
+		    LOG.INFO("Bulk sync return no data.");
+		    getNotify().fireBulkSyncNotification(true, "", strPartition, RhoRuby.ERR_NONE);		    
+		    return;
+	    }
+
+        if ( !isContinueSync() )
+            return;
+
+	    getNotify().fireBulkSyncNotification(false, "download", strPartition, RhoRuby.ERR_NONE);
+	    
+	    String fDataName = makeBulkDataFileName(strDataUrl, dbPartition.getDBPath(), "_bulk.data");
+	    String strHsqlDataUrl = getHostFromUrl(serverUrl) + strDataUrl + ".hsqldb.data";
+	    LOG.INFO("Bulk sync: download data from server: " + strHsqlDataUrl);
+	    {
+		    NetResponse resp1 = getNet().pullFile(strHsqlDataUrl, fDataName, this, null);
+		    if ( !resp1.isOK() )
+		    {
+			    LOG.ERROR("Bulk sync failed: cannot download database file: " + resp1.getRespCode() );
+			    stopSync();
+			    getNotify().fireBulkSyncNotification(true, "", strPartition, RhoRuby.ERR_REMOTESERVER);
+			    return;
+		    }
+	    }
+	    
+        if ( !isContinueSync() )
+            return;
+	    
+	    String fScriptName = makeBulkDataFileName(strDataUrl, dbPartition.getDBPath(), "_bulk.script" );
+	    String strHsqlScriptUrl = getHostFromUrl(serverUrl) + strDataUrl + ".hsqldb.script";
+	    LOG.INFO("Bulk sync: download script from server: " + strHsqlScriptUrl);
+	    {
+		    NetResponse resp1 = getNet().pullFile(strHsqlScriptUrl, fScriptName, this, null);
+		    if ( !resp1.isOK() )
+		    {
+			    LOG.ERROR("Bulk sync failed: cannot download database file.");
+			    stopSync();
+			    getNotify().fireBulkSyncNotification(true, "", strPartition, RhoRuby.ERR_REMOTESERVER);
+			    return;
+		    }
+	    }
+	    
+		LOG.INFO("Bulk sync: start change db");
+		getNotify().fireBulkSyncNotification(false, "change_db", strPartition, RhoRuby.ERR_NONE);
+		
+	    dbPartition.setBulkSyncDB(fDataName, fScriptName);
+	    
+		LOG.INFO("Bulk sync: end change db");
+		getNotify().fireBulkSyncNotification(false, "", strPartition, RhoRuby.ERR_NONE);
+	}
+	
+	String makeBulkDataFileName(String strDataUrl, String strDbPath, String strExt)throws Exception
+	{
+	    FilePath oUrlPath = new FilePath(strDataUrl);
+	    String strNewName = oUrlPath.getBaseName();
+	    String strOldName = RhoConf.getInstance().getString("bulksync_filename");
+	    if ( strOldName.length() > 0 && strNewName.compareTo(strOldName) != 0 )
+	    {
+	        FilePath oFilePath = new FilePath(strDbPath);
+	        String strFToDelete = oFilePath.changeBaseName(strOldName+strExt);
+	        LOG.INFO( "Bulk sync: remove old bulk file '" + strFToDelete + "'" );
+
+	        //RhoFile.deleteFile( strFToDelete.c_str() );
+	        RhoClassFactory.createFile().delete(strFToDelete);	        
+	    }
+
+	    RhoConf.getInstance().setString("bulksync_filename", strNewName, true);
+
+	    FilePath oFilePath = new FilePath(strDbPath);
+	    return oFilePath.changeBaseName(strNewName+strExt);
+	}
 	
 	int getStartSource()
 	{
@@ -391,12 +668,17 @@ public class SyncEngine implements NetRequest.IRhoSession
 
 	void syncAllSources()throws Exception
 	{
+		//TODO: do not stop on error source
 		boolean bError = false;
 	    for( int i = getStartSource(); i < m_sources.size() && isContinueSync(); i++ )
 	    {
 	    	SyncSource src = null;
 	    	try{
 		        src = (SyncSource)m_sources.elementAt(i);
+		        
+		        if ( src.getSyncType().compareTo("bulk_sync_only")==0 )
+		            continue;
+		        
 		        if ( isSessionExist() && getState() != esStop )
 		            src.sync();
 		
@@ -417,80 +699,24 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    	getNotify().fireSyncNotification(null, true, RhoRuby.ERR_NONE, RhoRuby.getMessageText("sync_completed"));
 	}
 	
-	void callLoginCallback(String callback, int nErrCode, String strMessage)
-	{
-		try{
-		    String strBody = "error_code=" + nErrCode;
-	        strBody += "&error_message=" + URI.urlEncode(strMessage != null? strMessage : "");
-	        strBody += "&rho_callback=1";
-	        
-	        String strUrl = getNet().resolveUrl(callback);
-	        
-			LOG.INFO( "Login callback: " + callback + ". Body: "+ strBody );
-	
-		    NetResponse resp = getNet().pushData( strUrl, strBody, this );
-		    if ( !resp.isOK() )
-		        LOG.ERROR( "Call Login callback failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData() );
-		}catch(Exception exc)
-		{
-			LOG.ERROR("Call Login callback failed.", exc);
-		}
-	}
-	
-	boolean checkAllSourcesFromOneDomain()throws Exception
-	{
-		loadAllSources();
-		
-	    if ( m_sources.size() == 0 )
-	        return true;
-	
-	    //All sources should be from one domain
-	    SyncSource src0 = (SyncSource)m_sources.elementAt(0);
-	    String srv0 = getServerFromUrl(src0.getUrl());
-	    for( int i = 1; i < m_sources.size(); i++ )
-	    {
-	        SyncSource src = (SyncSource)m_sources.elementAt(i);
-	        String srv = getServerFromUrl(src.getUrl());
-	        if ( srv.equals( srv0 ) != true )
-	            return false;
-	    }
-		
-	    return true;
-	}
-	
 	void login(String name, String password, String callback)
 	{
 		try {
-			if ( !checkAllSourcesFromOneDomain() )
-			{
-		    	callLoginCallback(callback, RhoRuby.ERR_DIFFDOMAINSINSYNCSRC, "");
-		    	return;
-			}
-
 		    NetResponse resp = null;
-			
+		    
 		    try{
 				
-			    String serverUrl = RhoConf.getInstance().getPath("syncserver");
-			    String strBody = "login=" + name + "&password=" + password + "&remember_me=1";
-			    
-			    resp = getNet().pullCookies( serverUrl+"client_login", strBody, this);
-			    
-			    if ( resp.isUnathorized() )
+			    resp = getNet().pullCookies( getProtocol().getLoginUrl(), getProtocol().getLoginBody(name, password), this );
+			    int nErrCode = RhoRuby.getErrorFromResponse(resp);
+			    if ( nErrCode != RhoRuby.ERR_NONE )
 			    {
-			        callLoginCallback(callback, RhoRuby.ERR_UNATHORIZED, resp.getCharData());
-			    	return;
-			    }
-			    
-			    if ( !resp.isOK() )
-			    {
-			    	callLoginCallback(callback, RhoRuby.ERR_REMOTESERVER, resp.getCharData());
-			    	return;
+			        getNotify().callLoginCallback(callback, nErrCode, resp.getCharData());
+			        return;
 			    }
 		    }catch(IOException exc)
 		    {
 				LOG.ERROR("Login failed.", exc);
-		    	callLoginCallback(callback, RhoRuby.getNetErrorCode(exc), "" );
+		    	getNotify().callLoginCallback(callback, RhoRuby.getNetErrorCode(exc), "" );
 		    	return;
 		    }
 		    
@@ -498,40 +724,43 @@ public class SyncEngine implements NetRequest.IRhoSession
 		    if ( strSession == null || strSession.length() == 0 )
 		    {
 		    	LOG.ERROR("Return empty session.");
-		    	callLoginCallback(callback, RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE, "" );
+		    	getNotify().callLoginCallback(callback, RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE, "" );
 		        return;
 		    }
 		    
-            //TODO: move session to client_info table
-		    getDB().executeSQL( "UPDATE sources SET session=?", strSession );
+		    IDBResult res = getUserDB().executeSQL("SELECT * FROM client_info");
+		    if ( !res.isEnd() )
+		    	getUserDB().executeSQL( "UPDATE client_info SET session=?", strSession );
+		    else
+		    	getUserDB().executeSQL("INSERT INTO client_info (session) values (?)", strSession);
 		
-		    //if ( ClientRegister.getInstance() != null )
-		    //	ClientRegister.getInstance().stopWait();
+		    if ( ClientRegister.getInstance() != null )
+		    	ClientRegister.getInstance().stopWait();
 		    
-	    	callLoginCallback(callback, RhoRuby.ERR_NONE, "" );
+	    	getNotify().callLoginCallback(callback, RhoRuby.ERR_NONE, "" );
 		    
 		}catch(Exception exc)
 		{
 			LOG.ERROR("Login failed.", exc);
-	    	callLoginCallback(callback, RhoRuby.ERR_RUNTIME, "" );
+	    	getNotify().callLoginCallback(callback, RhoRuby.ERR_RUNTIME, "" );
 		}
 	}
 
 	boolean isLoggedIn()throws DBException
 	{
-	    int nCount = 0;
-	    IDBResult res = getDB().executeSQL("SELECT count(session) FROM sources WHERE session IS NOT NULL");
+	    String strRes = "";
+	    IDBResult res = getUserDB().executeSQL("SELECT session FROM client_info");
 	    
 	    if ( !res.isEnd() )
-	        nCount = res.getIntByIdx(0);
+	    	strRes = res.getStringByIdx(0);
 	    
-	    return nCount > 0;
+	    return strRes.length() > 0;
 	}
 
 	String loadSession()throws DBException
 	{
-	    m_strSession = "";
-	    IDBResult res = getDB().executeSQL("SELECT session FROM sources WHERE session IS NOT NULL");
+		m_strSession = "";
+	    IDBResult res = getUserDB().executeSQL("SELECT session FROM client_info");
 	    
 	    if ( !res.isEnd() )
 	    	m_strSession = res.getStringByIdx(0);
@@ -541,7 +770,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 	
 	public void logout()throws Exception
 	{
-	    getDB().executeSQL( "UPDATE sources SET session = NULL");
+		getUserDB().executeSQL( "UPDATE client_info SET session = NULL");
 	    m_strSession = "";
 	
 	    loadAllSources();
@@ -553,15 +782,15 @@ public class SyncEngine implements NetRequest.IRhoSession
 		RhoConf.getInstance().saveToFile();
 		RhoConf.getInstance().loadConf();
 		
-		getDB().executeSQL("DELETE FROM client_info");
+		getUserDB().executeSQL("DELETE FROM client_info");
 		
 		logout();
 	}
 	
-	static String getServerFromUrl( String strUrl )
+	static String getHostFromUrl( String strUrl )
 	{
 		URI uri = new URI(strUrl);
-		return uri.getHost();
+		return uri.getPathSpecificPart() + "/";
 	}
 	
 }