rhodes 1.5.5 → 2.0.0.beta1

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

@@ -38,16 +38,14 @@ public class SyncNotify {
     static Mutex m_mxObjectNotify = new Mutex();
 
     Hashtable/*<int,SyncNotification>*/ m_mapSyncNotifications = new Hashtable();
-    Hashtable/*<int,SyncNotification>*/ m_mapSearchNotifications = new Hashtable();
-    
-    SyncNotification m_initialSyncNotify;
+    SyncNotification m_pSearchNotification;
+    SyncNotification m_bulkSyncNotify;
     
     Mutex m_mxSyncNotifications = new Mutex();
     ISyncStatusListener m_syncStatusListener = null;
     boolean m_bEnableReporting = false;
     
     SyncEngine getSync(){ return m_syncEngine; }
-	DBAdapter getDB(){ return getSync().getDB(); }
 	NetRequest getNet(){ return getSync().getNet(); }
 
     SyncNotify( SyncEngine syncEngine ) 
@@ -142,13 +140,15 @@ public class SyncNotify {
                     if (nNotifyType == enNone.intValue())
                         continue;
 
+                  //This is slow operation
+/*
                     if ( nNotifyType == enDelete.intValue() )
                     {
                         IDBResult res = getDB().executeSQL("SELECT object FROM object_values where object=? LIMIT 1 OFFSET 0", strObject );
                         if ( !res.isEnd() )
                             nNotifyType = enUpdate.intValue();    
                     }
-
+*/
                     if ( strBody.length() > 0 )
                     	strBody += "&rho_callback=1&";
 
@@ -174,10 +174,7 @@ public class SyncNotify {
                 return;
         }
 
-        NetResponse resp = getNet().pushData( strUrl, strBody, null );
-        if ( !resp.isOK() )
-            LOG.ERROR( "Fire object notification failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData() );
-
+        callNotify(strUrl, strBody);
     }
 
     void onObjectChanged(Integer nSrcID, String strObject, Integer nType)
@@ -275,7 +272,7 @@ public class SyncNotify {
 				
 				if ( strFullUrl.length() > 0 )
 				{
-	                IDBResult res = getDB().executeSQL("SELECT source_id from sources order by source_id");
+	                IDBResult res = DBAdapter.getUserDB().executeSQL("SELECT source_id from sources order by source_id");
 	                for ( ; !res.isEnd(); res.next() )
 			    	    m_mapSyncNotifications.put( new Integer(res.getIntByIdx(0)), new SyncNotification( strFullUrl, strParams, false ) );
 				}
@@ -294,25 +291,25 @@ public class SyncNotify {
 		}
 	}
 
-	void setSearchNotification(int source_id, String strUrl, String strParams )throws Exception
+	void setSearchNotification(String strUrl, String strParams )throws Exception
 	{
-		LOG.INFO( "Set search notification. Source ID: " + source_id + "; Url :" + strUrl + "; Params: " + strParams );
+		LOG.INFO( "Set search notification. Url :" + strUrl + "; Params: " + strParams );
 	    String strFullUrl = getNet().resolveUrl(strUrl);
 		
 	    if ( strFullUrl.length() > 0 )
 	    {
 	        synchronized(m_mxSyncNotifications){
-	        	m_mapSearchNotifications.put(new Integer(source_id),new SyncNotification( strFullUrl, strParams, true ) );
+	        	m_pSearchNotification = new SyncNotification( strFullUrl, strParams, true );
 	        }
-			LOG.INFO( " Done Set search notification. Source ID: " + source_id + "; Url :" + strFullUrl + "; Params: " + strParams );
+			LOG.INFO( " Done Set search notification. Url :" + strFullUrl + "; Params: " + strParams );
 	    }
 	}
 
-	void setInitialSyncNotification(String strUrl, String strParams )throws Exception
+	void setBulkSyncNotification(String strUrl, String strParams )throws Exception
 	{
 	    String strFullUrl = getNet().resolveUrl(strUrl);
 		
-		m_initialSyncNotify = new SyncNotification( strFullUrl, strParams, true );
+		m_bulkSyncNotify = new SyncNotification( strFullUrl, strParams, false );
 	}
 	
     public void setSyncStatusListener(ISyncStatusListener listener) 
@@ -357,7 +354,7 @@ public class SyncNotify {
 	    }
 	}
 
-	void fireInitialSyncNotification( boolean bFinish, int nErrCode )
+	void fireBulkSyncNotification( boolean bFinish, String status, String partition, int nErrCode )
 	{
 		if ( getSync().getState() == SyncEngine.esExit )
 			return;
@@ -365,7 +362,7 @@ public class SyncNotify {
 		//TODO: show report
 		if( nErrCode != RhoRuby.ERR_NONE)
 		{
-			String strMessage = RhoRuby.getMessageText("sync_failed_for") + "initial.";
+			String strMessage = RhoRuby.getMessageText("sync_failed_for") + "bulk.";
 			reportSyncStatus(strMessage,nErrCode,"");
 		}
 		
@@ -374,11 +371,13 @@ public class SyncNotify {
 		    String strBody = "", strUrl;
 			synchronized(m_mxSyncNotifications)
 			{
-		        if ( m_initialSyncNotify == null )
+		        if ( m_bulkSyncNotify == null )
 		            return;
 		        
-		        strUrl = m_initialSyncNotify.m_strUrl;
+		        strUrl = m_bulkSyncNotify.m_strUrl;
 		        strBody = "rho_callback=1";
+		        strBody += "&partition=" + partition;
+		        strBody += "&bulk_status="+status;
 		        strBody += "&status=";
 		        if ( bFinish )
 		        {
@@ -396,32 +395,22 @@ public class SyncNotify {
 		        else
 		        	strBody += "in_progress";
 		        
-		        if ( m_initialSyncNotify.m_strParams.length() > 0 )
-		            strBody += "&" + m_initialSyncNotify.m_strParams;
+		        if ( m_bulkSyncNotify.m_strParams.length() > 0 )
+		            strBody += "&" + m_bulkSyncNotify.m_strParams;
 		        
-		        bRemoveAfterFire = bRemoveAfterFire && m_initialSyncNotify.m_bRemoveAfterFire;
+		        bRemoveAfterFire = bRemoveAfterFire && m_bulkSyncNotify.m_bRemoveAfterFire;
 			}
 			
 		    if ( bRemoveAfterFire )
-		    	clearInitialSyncNotification();
+		    	clearBulkSyncNotification();
 		    
-			LOG.INFO( "Fire initial notification.Url :" + strUrl + "; Body: " + strBody );
-			
-		    NetResponse resp = getNet().pushData( strUrl, strBody, null );
-		    if ( !resp.isOK() )
-		        LOG.ERROR( "Fire intial notification failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData() );
-		    else
-		    {
-		        String szData = resp.getCharData();
-		        if ( szData != null && szData.equals("stop") )
-		        {
-		        	clearInitialSyncNotification();
-		        }
-		    }
-	
+			LOG.INFO( "Fire bulk notification.Url :" + strUrl + "; Body: " + strBody );
+
+            if ( callNotify(strUrl, strBody) )
+    	        clearBulkSyncNotification();
 		}catch(Exception exc)
 		{
-			LOG.ERROR("Fire initial notification failed.", exc);
+			LOG.ERROR("Fire bulk notification failed.", exc);
 		}
     	
 	}
@@ -433,7 +422,7 @@ public class SyncNotify {
 		
 		if( strMessage.length() > 0 || nErrCode != RhoRuby.ERR_NONE)
 		{
-			if ( !( src != null && src.m_strParams.length()>0) )
+			if ( !( src != null && src.isSearch()) )
 			{
 				if ( src != null && (strMessage==null || strMessage.length() == 0) )
 					strMessage = RhoRuby.getMessageText("sync_failed_for") + src.getName() + ".";
@@ -455,7 +444,12 @@ public class SyncNotify {
 		    boolean bRemoveAfterFire = bFinish;
 		    {
 		    	synchronized(m_mxSyncNotifications){
-			        SyncNotification sn = (SyncNotification)(src.isSearch() ? m_mapSearchNotifications.get(src.getID()) : m_mapSyncNotifications.get(src.getID()));
+			        SyncNotification sn = null;
+					if ( src.isSearch() )
+						sn = m_pSearchNotification;
+					else
+						sn = (SyncNotification)m_mapSyncNotifications.get(src.getID());
+			        
 			        if ( sn == null )
 			            return;
 			
@@ -496,25 +490,43 @@ public class SyncNotify {
 		    	clearNotification(src);
 		    
 			LOG.INFO( "Fire notification. Source ID: " + src.getID() + "; Url :" + strUrl + "; Body: " + strBody );
-			
-		    NetResponse resp = getNet().pushData( strUrl, strBody, null );
-		    if ( !resp.isOK() )
-		        LOG.ERROR( "Fire notification failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData() );
-		    else
-		    {
-		        String szData = resp.getCharData();
-		        if ( szData != null && szData.equals("stop") )
-		        {
-		            clearNotification(src);
-		        }
-		    }
-		
+
+            if ( callNotify(strUrl, strBody) )
+                clearNotification(src);
 		}catch(Exception exc)
 		{
 			LOG.ERROR("Fire notification failed.", exc);
 		}
 	}
 
+    boolean callNotify(String strUrl, String strBody )throws Exception
+    {
+/*        if ( getSync().isNoThreadedMode() )
+        {
+            const char* szName = strrchr(strUrl.c_str(), '/');
+            if (!szName)
+                szName = strUrl.c_str();
+            else
+                szName++;
+
+            String strName = "C_";
+            strName += szName;
+            rho_ruby_set_const( strName.c_str(), strBody.c_str());
+            return false;
+        }*/
+
+        NetResponse resp = getNet().pushData( strUrl, strBody, null );
+        if ( !resp.isOK() )
+            LOG.ERROR( "Fire object notification failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData() );
+        else
+        {
+            String szData = resp.getCharData();
+            return szData != null && szData.equals("stop");
+        }
+
+        return false;
+    }
+
 	void clearNotification(SyncSource src)
 	{
 		LOG.INFO( "Clear notification. Source : " + src.getName());
@@ -522,7 +534,7 @@ public class SyncNotify {
 	    synchronized(m_mxSyncNotifications)
 	    {
 	        if ( src.isSearch() )
-	            m_mapSearchNotifications.remove(src.getID());
+	            m_pSearchNotification = null;
 	        else
 	            m_mapSyncNotifications.remove(src.getID());
 	    }
@@ -540,12 +552,12 @@ public class SyncNotify {
 		}
 	}
 
-	void clearInitialSyncNotification() 
+	void clearBulkSyncNotification() 
 	{
-		LOG.INFO( "Clear initial notification." );
+		LOG.INFO( "Clear bulk notification." );
 		
 		synchronized(m_mxSyncNotifications){
-			m_initialSyncNotify = null;
+			m_bulkSyncNotify = null;
 		}
 	}
 	
@@ -586,5 +598,24 @@ public class SyncNotify {
 
 	    return nCount;
 	}
+
+	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 );
+
+            callNotify(strUrl, strBody);	
+		}catch(Exception exc)
+		{
+			LOG.ERROR("Call Login callback failed.", exc);
+		}
+	}
+	
 	
 }

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

@@ -0,0 +1,79 @@
+package com.rho.sync;
+
+import com.rho.RhoConf;
+import com.rho.FilePath;
+
+public class SyncProtocol_3 implements ISyncProtocol
+{
+    String m_strContentType;
+
+    public SyncProtocol_3()
+    {
+        m_strContentType = "application/json";
+    }
+
+    public String getContentType(){ return m_strContentType; }
+    public int getVersion(){ return 3; }
+
+    public String getLoginUrl()
+    {
+        return RhoConf.getInstance().getPath("syncserver") + "clientlogin";
+    }
+
+    public String getLoginBody( String name, String password)
+    {
+        return "{\"login\":\"" + name + "\",\"password\":\"" + password + "\",\"remember_me\":1}";
+    }
+
+    public String getClientCreateUrl()
+    {
+        return RhoConf.getInstance().getPath("syncserver") + "clientcreate";
+    }
+
+    public String getClientRegisterUrl()
+    {
+        return RhoConf.getInstance().getPath("syncserver") + "clientregister";
+    }
+
+    public String getClientRegisterBody( String strClientID, String strPin, int nPort, String strType )
+    {
+        return "{\"client_id\":\"" + strClientID +
+        	"\",\"device_pin\":\"" + strPin +
+            "\",\"device_port\":\"" + nPort +
+            "\",\"device_type\":\"" + strType + "\"}";
+    }
+
+    public String getClientResetUrl(String strClientID)
+    {
+        return RhoConf.getInstance().getPath("syncserver") + "clientreset?client_id=" + strClientID;
+    }
+
+    public String getClientChangesUrl()
+    {
+        String strUrl = RhoConf.getInstance().getPath("syncserver");
+        return strUrl.substring(0,strUrl.length()-1);
+    }
+
+    public String getServerQueryUrl(String strAction )
+    {
+        String strUrl = RhoConf.getInstance().getPath("syncserver");
+        if ( strAction.length() > 0 )
+            strUrl = FilePath.join(strUrl, strAction);
+        else
+            strUrl = strUrl.substring(0,strUrl.length()-1);
+
+        return strUrl;
+    }
+
+    public String getServerQueryBody(String strSrcName, String strClientID, int nPageSize )
+    {
+        String strQuery = "?client_id=" + strClientID + 
+                "&p_size=" + nPageSize + "&version=3";
+        
+        if ( strSrcName.length() > 0 )
+            strQuery += "&source_name=" + strSrcName;
+
+        return strQuery;
+    }
+
+}

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

@@ -23,15 +23,19 @@ import com.rho.RhoEmptyLogger;
 import com.rho.RhoEmptyProfiler;
 import com.rho.RhoLogger;
 import com.rho.RhoProfiler;
+import com.rho.RhodesApp;
+import com.rho.Tokenizer;
 import com.rho.net.*;
 import com.rho.db.*;
-import java.util.Vector;
 
-import org.json.me.JSONException;
+import java.util.Enumeration;
+import java.util.Vector;
+import java.util.Hashtable;
 
 import com.rho.FilePath;
 import com.rho.TimeInterval;
 import com.rho.RhoRuby;
+import com.rho.net.NetRequest.MultipartItem;
 
 class SyncSource
 {
@@ -41,104 +45,157 @@ class SyncSource
 	private static final RhoProfiler PROF = RhoProfiler.RHO_STRIP_PROFILER ? new RhoEmptyProfiler() : 
 		new RhoProfiler();
 
-	public static final int edpNone = 0, edpDeleteObjects = 2;
-	
-	static class SyncBlob
+	static class CAttrValue
 	{
-	   String m_strBody;
-	   String m_strFilePath;
+		String m_strAttrib = "";
+	    String m_strValue = "";
+	    String m_strBlobSuffix = "";
 
-	   SyncBlob(String body, String filePath ){
-	      m_strBody = body; m_strFilePath = filePath;
-	   }
+	    CAttrValue(String strAttrib, String strValue)
+	    {
+	        m_strAttrib = strAttrib;
+	        m_strValue = strValue;
 
-	   String getBody(){ return m_strBody; }
-	   String getFilePath(){ return m_strFilePath; }
+	    	if ( m_strAttrib.endsWith("-rhoblob")  )
+	        {
+	    		m_strBlobSuffix = "-rhoblob";
+	            m_strAttrib = m_strAttrib.substring(0,m_strAttrib.length()-m_strBlobSuffix.length());
+	        }
+	    }
 	};
 	
     SyncEngine m_syncEngine;
-
+    DBAdapter  m_dbAdapter;
+    
     Integer  m_nID;
-    String m_strName;
-    String m_strUrl;
+    String m_strName = "";
     long m_token = 0;
+    String m_strSyncType = "";
     boolean m_bTokenFromDB; 
     
     int m_nCurPageCount, m_nInserted, m_nDeleted, m_nTotalCount, m_nAttribCounter=0;
     boolean m_bGetAtLeastOnePage = false;
-    int m_eSyncServerDataPass = edpNone;
     int m_nErrCode = RhoRuby.ERR_NONE;
     String m_strError = "";
-    String m_strParams = "";
-    String m_strAction = "";
-    boolean m_bSearchSyncChanges = false;
-    int     m_nProgressStep = -1;
-    String m_strUrlParams = "";
+    public boolean m_bIsSearch = false;
     
-	String m_strPushBody = "";
+	//String m_strPushBody = "";
     Vector/*Ptr<CSyncBlob*>*/ m_arSyncBlobs = new Vector();
     
-    String m_strAskParams = "";
     int m_nRefreshTime = 0;
+    int m_nProgressStep = -1;
+    boolean m_bSchemaSource;
+    Hashtable/*<String,String>*/ m_hashLinks = new Hashtable();
+    Vector/*Ptr<net::CMultipartItem*>*/ m_arMultipartItems = new Vector();
+    Vector/*<String>*/                  m_arBlobAttrs = new Vector();
     
-    String getUrl() { return m_strUrl; }
     Integer getID() { return m_nID; }
     String getName() { return m_strName; }
+    String getSyncType(){ return m_strSyncType; }
     int getServerObjectsCount(){ return m_nInserted+m_nDeleted; }
-    boolean isSearch(){ return m_strParams.length() > 0;}
+    boolean isSearch(){ return m_bIsSearch;}
     
     long getToken(){ return m_token; }
+    boolean isTokenFromDB(){ return m_bTokenFromDB; }    
     void setToken(long token){ m_token = token; m_bTokenFromDB = false; }
     boolean isEmptyToken()
     {
     	return m_token == 0;
     }
-    void setAskParams(String ask){ m_strAskParams = ask;}
-    String getAskParams(){ return m_strAskParams;}
+    
+    int getProgressStep(){ return m_nProgressStep; }
+    void setProgressStep(int nProgressStep){ m_nProgressStep = nProgressStep; }
+
+    boolean getGetAtLeastOnePage(){ return m_bGetAtLeastOnePage; }
+    int getRefreshTime(){ return m_nRefreshTime; }
+    
     int getInsertedCount() { return m_nInserted; }
     int getDeletedCount() { return m_nDeleted; }
     void setCurPageCount(int nCurPageCount){m_nCurPageCount = nCurPageCount;}
     void setTotalCount(int nTotalCount){m_nTotalCount = nTotalCount;}
     int  getCurPageCount(){return m_nCurPageCount;}
     int  getTotalCount(){return m_nTotalCount;}
-    int  getProgressStep(){ return m_nProgressStep; }
 
-    void setSyncServerDataPass(int ePass){m_eSyncServerDataPass = ePass;}
-    boolean isDeleteObjectsPass(){ return m_eSyncServerDataPass == edpDeleteObjects; }
-    
     SyncEngine getSync(){ return m_syncEngine; }
     SyncNotify getNotify(){ return getSync().getNotify(); }
-	DBAdapter getDB(){ return getSync().getDB(); }
 	NetRequest getNet(){ return getSync().getNet(); }
+	ISyncProtocol getProtocol(){ return getSync().getProtocol(); }
 	void setRefreshTime( int nRefreshTime ){ m_nRefreshTime = nRefreshTime;}
-	void setUrlParams(String strParams){m_strUrlParams=strParams!=null?strParams:"";}
-	void setUrl(String strUrl){m_strUrl=strUrl;}
-	
-    SyncSource(int id, String strUrl, String name, long token, SyncEngine syncEngine )
+	DBAdapter getDB(){ return m_dbAdapter; }
+
+    SyncSource(SyncEngine syncEngine, DBAdapter db)throws DBException
     {
     	m_syncEngine = syncEngine;
-        m_nID = new Integer(id);
-        m_strUrl = strUrl;
-        m_strName = name;
-        m_token = token;
-        m_bTokenFromDB = true;
+    	m_dbAdapter = db;
+    	
+        m_nID = new Integer(0);
         
+        m_bTokenFromDB = true;
+
         m_nCurPageCount = 0;
         m_nInserted = 0;
         m_nDeleted = 0;
+        m_nTotalCount = 0;
+        m_bGetAtLeastOnePage = false;
+
+        m_nErrCode = RhoRuby.ERR_NONE;
+        m_bIsSearch = false;
+        m_bSchemaSource = db.isTableExist(m_strName);
     }
 	
-    SyncSource(SyncEngine syncEngine)
+    SyncSource(int id, String name, String strSyncType, DBAdapter db, SyncEngine syncEngine )throws DBException
     {
     	m_syncEngine = syncEngine;
-        m_nID = new Integer(0);
-        m_strUrl = "";
-        m_strName = "";
-        m_bTokenFromDB = true;
+    	m_dbAdapter = db;
+        m_nID = new Integer(id);
+        m_strName = name;
+        m_strSyncType = strSyncType;
         
         m_nCurPageCount = 0;
         m_nInserted = 0;
         m_nDeleted = 0;
+        m_nTotalCount = 0;
+        m_bGetAtLeastOnePage = false;
+
+        m_nErrCode = RhoRuby.ERR_NONE;
+        m_bIsSearch = false;
+
+        IDBResult res = db.executeSQL("SELECT token,links from sources WHERE source_id=?", m_nID);
+        if ( !res.isEnd() )
+        {
+        	m_token = res.getLongByIdx(0);
+            m_bTokenFromDB = true;
+        }else
+        {
+        	m_token = 0;
+            m_bTokenFromDB = true;
+        }
+        
+        m_bSchemaSource = db.isTableExist(m_strName);
+        parseLinks(res.getStringByIdx(1));
+    }
+	
+    void parseLinks(String strLinks)
+    {
+        if (strLinks.length() == 0 )
+            return;
+
+        Tokenizer oTokenizer = new Tokenizer( strLinks, "," );
+
+        String strSrcName = "";
+        while (oTokenizer.hasMoreTokens()) 
+        {
+    	    String tok = oTokenizer.nextToken();
+    	    if (tok.length() == 0)
+    		    continue;
+            
+            if ( strSrcName.length() > 0 )
+            {
+                m_hashLinks.put(strSrcName, tok);
+                strSrcName = "";
+            }else
+                strSrcName = tok;
+        }
     }
     
 	void sync() throws Exception
@@ -146,44 +203,13 @@ class SyncSource
     	getNotify().fireSyncNotification(null, false, RhoRuby.ERR_NONE, RhoRuby.getMessageText("syncronizing") + getName() + "...");
 		
 	    TimeInterval startTime = TimeInterval.getCurrentTime();
+	    m_bIsSearch = false;
 	    
 	    try{
-	    	PROF.START("Pull");
 	        if ( isEmptyToken() )
 	            processToken(1);
 	    	
-	        boolean bSyncedServer = false;
-	        if ( m_strParams.length() == 0 || m_bSearchSyncChanges )
-	        {
-	            if ( isPendingClientChanges() )
-	            {
-	            	LOG.INFO("Client has unconfirmed items in database. Sync server first.");
-	                syncServerChanges();
-	                bSyncedServer = true;
-	            }
-
-	            if ( bSyncedServer && isPendingClientChanges() )
-	            {
-	            	LOG.ERROR("Client still has unconfirmed items in database. Sync is stopped.");
-	                getSync().setState(SyncEngine.esStop);
-	            }
-	            else
-	            {
-	                boolean bSyncClient = false;
-	                {
-	                    IDBResult res = getDB().executeSQL("SELECT object FROM changed_values WHERE source_id=? and sent<=1 LIMIT 1 OFFSET 0", getID());
-	                    bSyncClient = !res.isEnd();
-	                }
-	                if ( bSyncClient )
-	                {
-	                    syncClientChanges();
-	                    getAndremoveAsk();
-	                    bSyncedServer = false;
-	                }
-	            }
-	        }
-	        PROF.STOP("Pull");
-
+	        boolean bSyncedServer = syncClientChanges();
 	        if ( !bSyncedServer )
 	        	syncServerChanges();
 	        
@@ -193,193 +219,215 @@ class SyncSource
 	    	throw exc;
 	    }finally{
 		   TimeInterval endTime = TimeInterval.getCurrentTime();
-		    getDB().executeSQL("UPDATE sources set last_updated=?,last_inserted_size=?,last_deleted_size=?, "+
+		   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=?", 
 		                         new Long(endTime.toULong()/1000), new Integer(getInsertedCount()), new Integer(getDeletedCount()), new Long((endTime.minus(startTime)).toULong()), 
 		                         new Integer(m_bGetAtLeastOnePage?1:0), new Integer(m_nRefreshTime), getID() );
 	    }
 	}
 
+	boolean syncClientChanges()throws Exception
+	{
+	    boolean bSyncedServer = false;
+	    if ( isPendingClientChanges() )
+	    {
+	        syncServerChanges();
+	        bSyncedServer = true;
+	    }
+
+	    if ( bSyncedServer && isPendingClientChanges() )
+	        getSync().setState(SyncEngine.esStop);
+	    else
+	    {   
+	      	PROF.START("Pull");
+
+	        boolean bSyncClient = false;
+	        {
+	            IDBResult res = getDB().executeSQL("SELECT object FROM changed_values WHERE source_id=? LIMIT 1 OFFSET 0", getID());
+	            bSyncClient = !res.isEnd();
+	        }
+	        if ( bSyncClient )
+	        {
+	            doSyncClientChanges();
+	            bSyncedServer = false;
+	        }
+
+	        PROF.STOP("Pull");
+	    }
+
+	    return bSyncedServer;
+	}
+	
 	boolean isPendingClientChanges()throws DBException
 	{
 	    IDBResult res = getDB().executeSQL("SELECT object FROM changed_values WHERE source_id=? and update_type='create' and sent>1  LIMIT 1 OFFSET 0", getID());
 	    return !res.isEnd();
 	}
-	
-	void syncClientBlobs(String strBaseQuery)throws Exception
+
+	void doSyncClientChanges()throws Exception
 	{
-	    String strQuery;
-	    for( int i = 0; i < m_arSyncBlobs.size(); i ++)
+	    String arUpdateTypes[] = {"create", "update", "delete"};
+	    boolean arUpdateSent[] = {false, false, false};
+
+	    m_arMultipartItems.removeAllElements();
+	    m_arBlobAttrs.removeAllElements();
+	    String strBody = "{\"source_name\":\"" + getName() + "\",\"client_id\":\"" + getSync().getClientID() + "\"";
+	    boolean bSend = false;
+	    int i = 0;
+	    for( i = 0; i < 3 && getSync().isContinueSync(); i++ )
 	    {
-	        SyncBlob blob = (SyncBlob)m_arSyncBlobs.elementAt(i);
-	
-	        String strFilePath = RhoClassFactory.createFile().getDirPath("");
-	        String strBlobPath = blob.getFilePath(); 
-	        if ( strBlobPath.startsWith("/") )
-	        	strBlobPath = strBlobPath.substring(1);
-	        
-	        strFilePath += strBlobPath;
-	        
-	        strQuery = strBaseQuery + "&" + blob.getBody();
-	        try{
-		        NetResponse resp = getNet().pushFile(strQuery, strFilePath, getSync(), null );
-		        if ( !resp.isOK() )
-		        {
-		            getSync().setState(SyncEngine.esStop);
-		        	m_nErrCode = RhoRuby.ERR_REMOTESERVER;
-		        	//m_strError = resp.getCharData();
-		            return;
-		        }
-		    }catch(Exception exc)
-		    {
-		    	m_nErrCode = RhoRuby.getNetErrorCode(exc);
-		    	throw exc;
-		    }
+	        String strBody1;
+	        strBody1 = makePushBody_Ver3(arUpdateTypes[i]);
+	        if (strBody1.length() > 0)
+	        {
+	            strBody += "," + strBody1;
 
-		    getDB().startTransaction();
-	        getDB().executeSQL("DELETE FROM changed_values WHERE source_id=? and attrib_type=? and value=?", getID(), "blob.file", blob.getFilePath() );
-	        getDB().executeSQL("DELETE FROM object_values WHERE source_id=? and attrib_type=? and value=?", getID(), "blob.file", blob.getFilePath() );
-	        getDB().endTransaction();
+	            String strBlobAttrs = "";
+	            for ( int j = 0; j < (int)m_arBlobAttrs.size(); j++)
+	            {
+	                if ( strBlobAttrs.length() > 0 )   
+	                    strBlobAttrs += ",";
+
+	                strBlobAttrs += "\"" + m_arBlobAttrs.elementAt(j) + "\"";
+	            }
+
+	            if ( strBlobAttrs.length() > 0 )
+	                strBody += ",\"blob_fields\":[" + strBlobAttrs + "]";
+
+	            arUpdateSent[i] = true;
+	            bSend = true;
+	        }
 	    }
-	
-	    m_arSyncBlobs.removeAllElements();
-	}
+	    strBody += "}";
 
-	void syncClientChanges()throws Exception
-	{
-	    String[] arUpdateTypes = {"create", "update", "delete"};
-	    for( int i = 0; i < 3 && getSync().isContinueSync(); i++ )
+	    if ( bSend )
 	    {
-	        String strUrl = getUrl() + "/" + arUpdateTypes[i];
-	        strUrl += "objects";
-	        String strQuery = SyncEngine.SYNC_SOURCE_FORMAT() + "&client_id=" + getSync().getClientID();
+	        LOG.INFO( "Push client changes to server. Source: " + getName() + "Size :" + strBody.length() );
+	        LOG.TRACE("Push body: " + strBody);		
 
-	        m_arSyncBlobs.removeAllElements();
-	        String strBody = makePushBody(arUpdateTypes[i]);
-	        if ( strBody.length() > 0 )
+	        if ( m_arMultipartItems.size() > 0 )
 	        {
-			    LOG.INFO( "Push client changes to server. Source: " + getName() + "Size :" + strBody.length() );
-			    LOG.TRACE("Push body: " + strBody);		
-	 
-	            NetResponse resp = getNet().pushData(strUrl+strQuery,strBody, getSync());
+	            MultipartItem oItem = new MultipartItem();
+	            oItem.m_strBody = strBody;
+	            //oItem.m_strContentType = getProtocol().getContentType();
+	            oItem.m_strName = "cud";
+	            m_arMultipartItems.addElement(oItem);
+
+	            NetResponse resp = getNet().pushMultipartData( getProtocol().getClientChangesUrl(), m_arMultipartItems, getSync(), null );
 	            if ( !resp.isOK() )
 	            {
 	                getSync().setState(SyncEngine.esStop);
 	                m_nErrCode = RhoRuby.ERR_REMOTESERVER;
-	                continue;
 	            }
-	        }
-	 
-	        if ( m_arSyncBlobs.size()>0 )
+	        }else
 	        {
-			    LOG.INFO( "Push blobs to server. Source: " + getName() + "Count :" + m_arSyncBlobs.size() );
-	            //oo conflicts
-	            if ( i < 1 ) //create
-	                getDB().executeSQL("UPDATE changed_values SET sent=2 WHERE source_id=? and update_type=? and (attrib_type IS NULL or attrib_type!=?) and sent=1", 
-	                    getID(), arUpdateTypes[i], "blob.file" );
-	            else
-	            //
-	            	getDB().executeSQL("DELETE FROM changed_values WHERE source_id=? and update_type=? and (attrib_type IS NULL or attrib_type!=?) and sent=1", 
-	            		getID(), arUpdateTypes[i], "blob.file" );
-	            
-	            syncClientBlobs(strUrl+strQuery);
-	        }else if ( strBody.length() > 0 )
+	            NetResponse resp = getNet().pushData( getProtocol().getClientChangesUrl(), strBody, getSync());
+	            if ( !resp.isOK() )
+	            {
+	                getSync().setState(SyncEngine.esStop);
+	                m_nErrCode = RhoRuby.ERR_REMOTESERVER;
+	            }
+	        }
+	    }
+
+	    for( i = 0; i < 3 && getSync().isContinueSync(); i++ )
+	    {
+	        if ( arUpdateSent[i] )
 	        {
 	            //oo conflicts
 	            if ( i < 1 ) //create
 	                getDB().executeSQL("UPDATE changed_values SET sent=2 WHERE source_id=? and update_type=? and sent=1", getID(), arUpdateTypes[i] );
 	            else
 	            //
-	            	getDB().executeSQL("DELETE FROM changed_values WHERE source_id=? and update_type=? and sent=1", getID(), arUpdateTypes[i] );
+	                getDB().executeSQL("DELETE FROM changed_values WHERE source_id=? and update_type=? and sent=1", getID(), arUpdateTypes[i] );
 	        }
 	    }
+
+	    m_arMultipartItems.removeAllElements();
+	    m_arBlobAttrs.removeAllElements();
 	}
 	
-	/*
-	 * Construct the body of the request by filtering 
-	 * the attr_filter string. The body format should
-	 * look like the following:
-	 * create: attrvals[][attrib]=<name|industry>&attrvals[][object]=<locallygeneratedid>&attrvals[][value]=<some value>
-	 * update: attrvals[][attrib]=<name|industry>&attrvals[][object]=<remoteid>&attrvals[][value]=<some new value>
-	 * delete: attrvals[][attrib]=<name|industry>&attrvals[][object]=<remoteid>
-	 */
-	
-	String makePushBody( String szUpdateType)throws DBException
+	//{"source_name":"SampleAdapter","client_id":1,"create":{"1":{"brand":"Apple","name":"iPhone","price":"199.99"}}}
+	//{"source_name":"SampleAdapter","client_id":1,"update":{"1":{"brand":"Apple","name":"iPhone","price":"199.99"}}}
+	//{"source_name":"SampleAdapter","client_id":1,"delete":{"1":{"brand":"Apple","name":"iPhone","price":"199.99"}}}
+	//{"source_name":"SampleAdapter","client_id":1,"delete":{"3":{"brand":"HTC","name":"Fuze","price":"299.99"}},"create":{"1":{"brand":"Apple","name":"iPhone","price":"199.99"}},"update":{"2":{"brand":"Android","name":"G2","price":"99.99"}}}
+	String makePushBody_Ver3( String strUpdateType)throws DBException
 	{
 		String strBody = "";
-        getDB().Lock();
-		
-	    IDBResult res = getDB().executeSQL("SELECT attrib, object, value, attrib_type, main_id "+
-						 "FROM changed_values where source_id=? and update_type =? and sent<=1 ORDER BY sent DESC", getID(), szUpdateType );
+	    getDB().Lock();
+	    IDBResult res = getDB().executeSQL("SELECT attrib, object, value, attrib_type "+
+	        "FROM changed_values where source_id=? and update_type =? and sent<=1 ORDER BY object", getID(), strUpdateType );
+
 	    if ( res.isEnd() )
 	    {
-	    	getDB().Unlock();
-	    	return strBody;
+	        getDB().Unlock();
+	        return strBody;
 	    }
-	    
+
+	    String strCurObject = "";
+	    boolean bFirst = true;
 	    for( ; !res.isEnd(); res.next() )
 	    {
-	        String strSrcBody = "attrvals[][attrib]=" + res.getStringByIdx(0);
-	
-	        if ( res.getStringByIdx(1).length() > 0 ) 
-	            strSrcBody += "&attrvals[][object]=" + res.getStringByIdx(1);
-
-	        long main_id = res.getLongByIdx(4);
-	        if ( main_id != 0 )
-	            strSrcBody += "&attrvals[][id]=" + main_id;
-	        
+	        String strAttrib = res.getStringByIdx(0);
+	        String strObject = res.getStringByIdx(1);
 	        String value = res.getStringByIdx(2);
 	        String attribType = res.getStringByIdx(3);
-	
-	
-	        //if ( value.length() > 0 )
+
+	        if ( attribType.compareTo("blob.file") == 0 )
 	        {
-	            if ( attribType.equals("blob.file") )
+	            MultipartItem oItem = new MultipartItem();
+	            oItem.m_strFilePath = RhodesApp.getInstance().resolveDBFilesPath(value);
+	            oItem.m_strContentType = "application/octet-stream";
+	            oItem.m_strName = strAttrib + "-" + strObject;
+
+	            m_arBlobAttrs.addElement(strAttrib);
+	            m_arMultipartItems.addElement(oItem);
+	        }
+
+	        if ( strBody.length() == 0 )
+	            strBody += "\"" + strUpdateType + "\":{";
+
+	        if ( strObject.compareTo(strCurObject) != 0 )
+	        {
+	            if ( strCurObject.length() > 0 )
 	            {
-	                FilePath oBlobPath = new FilePath(value);
-	                strSrcBody += "&attrvals[][value]=";
-	                strSrcBody += oBlobPath.getBaseName();
-	                strSrcBody += "&attrvals[][attrib_type]=blob";
-	
-	                if ( value.length() > 0 )
-	                	m_arSyncBlobs.addElement(new SyncBlob(strSrcBody,value));
-	                continue;
-	            }else
-	                strSrcBody += "&attrvals[][value]=" + value;
+	                if ( !bFirst )
+	                    strBody += "}";
+	                strBody += ",";
+	            }
+
+	            bFirst = true;
+	            strBody += "\"" + strObject + "\"";
+	            strCurObject = strObject;
 	        }
-	
-	        if ( strBody.length() > 0 )
-	            strBody += "&";
-	
-	        strBody += strSrcBody;
-	    }
-	    
-	    getDB().executeSQL("UPDATE changed_values SET sent=1 WHERE source_id=? and update_type=? and sent=0", getID(), szUpdateType );	    
-	    getDB().Unlock();
-	    
-	    return strBody;
-	}
+	            
+	        if (!bFirst)
+	            strBody += ",";
 
-	void getAndremoveAsk()throws DBException
-	{
-	    String askParams = "";
-	    {
-	        IDBResult res = getDB().executeSQL("SELECT object, attrib, value "+
-				     "FROM changed_values WHERE source_id=? and update_type =?", getID(), "ask" );
-	        if ( !res.isEnd() )
+	        if ( strAttrib.length() > 0  )
 	        {
-	            askParams = res.getStringByIdx(2);
+	            if ( bFirst )
+	                strBody += ":{";
 
-	            getDB().executeSQL("DELETE FROM object_values WHERE object=? and attrib=? and source_id=?", 
-	                res.getStringByIdx(0), res.getStringByIdx(1), getID() );
+	            strBody += "\"" + strAttrib + "\":\"" + value + "\"";
+	            bFirst = false;
 	        }
-	        
-		    getDB().executeSQL("DELETE FROM changed_values WHERE source_id=? and update_type=?", getID(), "ask" );
 	    }
 
-	    setAskParams(askParams);
+	    if ( strBody.length() > 0 )
+	    {
+	        if ( !bFirst )
+	            strBody += "}";
+
+	        strBody += "}";
+	    }
+
+	    getDB().executeSQL("UPDATE changed_values SET sent=1 WHERE source_id=? and update_type=? and sent=0", getID(), strUpdateType );
+	    getDB().Unlock();
+	    
+	    return strBody;
 	}
-	
+
 	void syncServerChanges()throws Exception
 	{
 		LOG.INFO("Sync server changes source ID :" + getID() );
@@ -387,42 +435,24 @@ class SyncSource
 	    while( getSync().isContinueSync() )
 	    {
 	        setCurPageCount(0);
-	        String strUrl = getUrl();
-	        if ( m_strAction.length() > 0 )
-	            strUrl = FilePath.join(strUrl, m_strAction);
-	        
-			String strQuery = SyncEngine.SYNC_SOURCE_FORMAT() + "&client_id=" + getSync().getClientID() + 
-	                "&p_size=" + getSync().SYNC_PAGE_SIZE() + "&version=" + getSync().SYNC_VERSION();
-	        if ( m_strParams.length() > 0 )
-	            strQuery += m_strParams;
-	
-	        if( m_strUrlParams.length() > 0 )
-	            strQuery += "&" + m_strUrlParams;
-	        	
-	        if ( getAskParams().length() > 0 )
-	        {
-	            getSync();
-				strUrl +=  SyncEngine.SYNC_ASK_ACTION();
-	            strQuery += "&question=" + getAskParams();
-	        }
-	
+	        String strUrl = getProtocol().getServerQueryUrl("");
+	        String strQuery = getProtocol().getServerQueryBody(getName(), getSync().getClientID(), getSync().getSyncPageSize());
+
 	        if ( !m_bTokenFromDB && getToken() > 1 )
-	            strQuery += "&ack_token=" + getToken();
-	
+	            strQuery += "&token=" + getToken();
+
 			LOG.INFO( "Pull changes from server. Url: " + (strUrl+strQuery) );
 			
 			NetResponse resp = null;
 			try{
-			    PROF.START("Net");	    
-				resp = getNet().pullData(strUrl+strQuery, getSync());
+		        PROF.START("Net");	    
+		        resp = getNet().pullData(strUrl+strQuery, getSync());
 				PROF.STOP("Net");
-				
+	
 		        if ( !resp.isOK() )
 		        {
 		            getSync().stopSync();
-		        	m_nErrCode = RhoRuby.ERR_REMOTESERVER;
-		        	//m_strError = resp.getCharData();
-		            
+		            m_nErrCode = RhoRuby.getErrorFromResponse(resp);
 		            continue;
 		        }
 		    }catch(Exception exc)
@@ -430,312 +460,429 @@ class SyncSource
 		    	m_nErrCode = RhoRuby.getNetErrorCode(exc);
 		    	throw exc;
 		    }
-	
-	        processServerData(resp.getCharData());
-	        
-			//String strData =
-			//	"[{count:16},{version:2},{rt:0},{total_count:16},{token:\"31272969717999\"},{s:\"Years\",ol:[{o:\"7\",av:[{a:\"year\",i:847548358725629473,v:\"2000\"}]},{o:\"11\",av:[{a:\"year\",i:412366391662703410,v:\"1996\"}]},{o:\"20\",av:[{a:\"year\",i:137205700852855225,v:\"2010\"}]},{o:\"8\",av:[{a:\"year\",i:679868441309756807,v:\"1999\"}]},{o:\"12\",av:[{a:\"year\",i:456800387229102986,v:\"1995\"}]},{o:\"3\",av:[{a:\"year\",i:734226969968776876,v:\"2004\"}]},{o:\"9\",av:[{a:\"year\",i:56010014622863357,v:\"1998\"}]},{o:\"17\",av:[{a:\"year\",i:822839088903421583,v:\"2007\"}]},{o:\"4\",av:[{a:\"year\",i:694980267678628747,v:\"2003\"}]},{o:\"18\",av:[{a:\"year\",i:454618145604696729,v:\"2008\"}]},{o:\"5\",av:[{a:\"year\",i:161829862235046918,v:\"2002\"}]},{o:\"1\",av:[{a:\"year\",i:429713603438265228,v:\"2006\"}]},{o:\"19\",av:[{a:\"year\",i:53905967515604512,v:\"2009\"}]},{o:\"6\",av:[{a:\"year\",i:623979215240715853,v:\"2001\"}]},{o:\"10\",av:[{a:\"year\",i:906257189782972492,v:\"1997\"}]},{o:\"2\",av:[{a:\"year\",i:659684360823905556,v:\"2005\"}]}]}]";				
-	        //"[{count:10},{version:1},{total_count: 5425},{token: 123},{s:\"RhoDeleteSource\",ol:[{o:\"rho_del_obj\",av:[{i:55550425},{i:75665819},{i:338165272},{i:402396629},{i:521753981},{i:664143530},{i:678116186},{i:831092394},{i:956041217},{i:970452458}]}]}]";
-			/*"[{count: 124},{version: 1},{total_count: 5425},{token: 123},"
-	        "{s:\"Product\",ol:["
-			"{oo:\"123\",o:\"2ed2e0c7-8c4c-99c6-1b37-498d250bb8e7\",av:["
-			"{a:\"first_name\",i:47354289,v:\"Lars. \n\n Burgess\", t:\"blob\"},"
-	        "{a:\"second_name\",i:55555,v:\"Burgess\"}]},"
-	        "{oo:\"456\", e:\"Something went wrong creating this record on the backend: code 7\"}"
-	        "]}]"; */
-			/*"[{count: 1},{version: 1},{total_count: 1},{token: 123},"
-	        "{s:\"Product\",ol:["
-	        "{oo:\"94\", e:\"Something went wrong creating this record on the backend: code 7\"}"
-	        "]}]";*/
-			/*"[{count: 1},{version: 1},{total_count: 1},{token: 123},"
-	        "{s:\"Product\",ol:["
-	        "{o:\"94\", av:["
-	        "{a:\"TEST\",i:55555,v:\"Geny\"}]},"
-	        "]}]";
-
-			//u:\"query\",  
-			 */
-			//processServerData(strData);
-
-	        if ( getAskParams().length() > 0 || getCurPageCount() == 0 )
+
+	        String szData = resp.getCharData();
+
+	        PROF.START("Parse");
+	        JSONArrayIterator oJsonArr = new JSONArrayIterator(szData);
+	        PROF.STOP("Parse");
+
+	        processServerResponse_ver3(oJsonArr);
+
+	        if ( getToken() == 0 )
 	            break;
 	    }
 	}
 
-	void processServerData(String szData)throws Exception
+	void processServerResponse_ver3(JSONArrayIterator oJsonArr)throws Exception
 	{
-		LOG.TRACE("Server data: " + szData);
-		PROF.START("Parse");		
-	    JSONArrayIterator oJsonArr = new JSONArrayIterator(szData);
-	    PROF.STOP("Parse");
-	    
 	    PROF.START("Data1");
-	    if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("error") )
+
+	    int nVersion = 0;
+	    if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("version") )
 	    {
-	        m_strError = oJsonArr.getCurItem().getString("error");
-	        m_nErrCode = RhoRuby.ERR_CUSTOMSYNCSERVER;
+	        nVersion = oJsonArr.getCurItem().getInt("version");
+	        oJsonArr.next();
+	    }
+
+	    if ( nVersion != getProtocol().getVersion() )
+	    {
+	        LOG.ERROR("Sync server send data with incompatible version. Client version: " + getProtocol().getVersion() +
+	            "; Server response version: " + nVersion + ". Source name: " + getName() );
 	        getSync().stopSync();
+	        m_nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
 	        return;
 	    }
-	    
-	    if ( !oJsonArr.isEnd() )
+
+	    if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("source") )
 	    {
-	        setCurPageCount(oJsonArr.getCurItem().getInt("count"));
+	        //skip it. it uses in search only
 	        oJsonArr.next();
 	    }
-	    int nVersion = 0;
-	    if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("version") )
+
+	    if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("token"))
 	    {
-	        nVersion = oJsonArr.getCurItem().getInt("version");
+	        processToken(oJsonArr.getCurItem().getUInt64("token"));
 	        oJsonArr.next();
 	    }
-	    
-	    if ( nVersion != getSync().SYNC_VERSION() )
+
+	    if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("count") )
 	    {
-	        LOG.ERROR("Sync server send data with incompatible version. Client version: " + getSync().SYNC_VERSION() +
-	            "; Server response version: " + nVersion + ". Source name: " + getName() );
-	        getSync().stopSync();
-	        m_nErrCode = RhoRuby.ERR_SYNCVERSION;
-	        return;
+	        setCurPageCount(oJsonArr.getCurItem().getInt("count"));
+	        oJsonArr.next();
 	    }
-	    
-	    if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("rt") )
+
+	    if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("refresh_time") )
 	    {
-	        setRefreshTime(oJsonArr.getCurItem().getInt("rt"));
+	        setRefreshTime(oJsonArr.getCurItem().getInt("refresh_time"));
 	        oJsonArr.next();
 	    }
-	    
+
+	    if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("progress_count") )
+	    {
+	        //TODO: progress_count
+	        //setTotalCount(oJsonArr.getCurItem().getInt("progress_count"));
+	        oJsonArr.next();
+	    }
+
 	    if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("total_count") )
 	    {
 	        setTotalCount(oJsonArr.getCurItem().getInt("total_count"));
 	        oJsonArr.next();
 	    }
-	    
-//	    if ( getServerObjectsCount() == 0 )
-//	    	getNotify().fireSyncNotification(this, false, RhoRuby.ERR_NONE, "");
-	    
-	    if ( !oJsonArr.isEnd() )
+	   /* if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("source-error") )
 	    {
-	        processToken(oJsonArr.getCurItem().getUInt64("token"));
-	        oJsonArr.next();
-	    }else if ( getCurPageCount() == 0 )
+	        CJSONEntry oJsonErr = oJsonArr.getCurItem().getEntry("source-error");
+	        m_strError = oJsonErr.getString("message");
+	        m_nErrCode = RhoRuby.ERR_CUSTOMSYNCSERVER;
+	        getSync().stopSync();
+	        return;
+	    }*/
+
+	    //if ( getServerObjectsCount() == 0 )
+	    //    getNotify().fireSyncNotification(this, false, RhoRuby.ERR_NONE, "");
+
+	    if ( getToken() == 0 )
 	    {
-	    	//oo conflicts
-	    	getDB().executeSQL("DELETE FROM changed_values where source_id=? and sent>=3", getID() );
-	    	//
-	        processToken(0);
+	        //oo conflicts
+	        getDB().executeSQL("DELETE FROM changed_values where source_id=? and sent>=3", getID() );
+	        //
+
 	    }
-	    
-		LOG.INFO( "Got " + getCurPageCount() + "(Processed: " +  getServerObjectsCount() + ") records of " + getTotalCount() + " from server. Source: " + getName()
-				+ ". Version: " + nVersion );
-		
-		PROF.STOP("Data1");
-		if ( !oJsonArr.isEnd() && getSync().isContinueSync() )
-		{
-			PROF.START("Data");
-		    getDB().startTransaction();
-
-		    try{
-	            int nSavedPos = oJsonArr.getCurPos();
-	            setSyncServerDataPass(edpNone);
-	            processServerData_Ver1(oJsonArr);
-
-	            setSyncServerDataPass(edpDeleteObjects);
-	            oJsonArr.reset(nSavedPos);
-	            processServerData_Ver1(oJsonArr);
-		        
-			    PROF.STOP("Data");		    
-		    	
-		    	PROF.START("DB");
-				getDB().endTransaction();
-			    PROF.STOP("DB");
-			    
-			    getNotify().fireObjectsNotification();
-		        
-		    }catch(Exception exc){
-		    	getDB().rollback();
-		    	throw exc;
-			}
-		    
-		}
-		
+
+		LOG.INFO("Got " + getCurPageCount() + "(Processed: " +  getServerObjectsCount() + ") records of " + getTotalCount() + " from server. Source: " + getName()
+	         + ". Version: " + nVersion );
+
+	    PROF.STOP("Data1");
+	    if ( !oJsonArr.isEnd() && getSync().isContinueSync() )
+	    {
+	        JSONEntry oCmds = oJsonArr.getCurItem();
+	        PROF.START("Data");
+
+	        getDB().startTransaction();
+	        if ( oCmds.hasName("metadata") && getSync().isContinueSync() )
+	        {
+	            String strMetadata = oCmds.getString("metadata");
+	            getDB().executeSQL("UPDATE sources SET metadata=? WHERE source_id=?", strMetadata, getID() );
+	        }
+	        if ( oCmds.hasName("links") && getSync().isContinueSync() )
+	            processSyncCommand("links", oCmds.getEntry("links") );
+	        if ( oCmds.hasName("delete") && getSync().isContinueSync() )
+	            processSyncCommand("delete", oCmds.getEntry("delete") );
+	        if ( oCmds.hasName("insert") && getSync().isContinueSync() )
+	            processSyncCommand("insert", oCmds.getEntry("insert") );
+
+	        PROF.STOP("Data");
+
+		    PROF.START("DB");
+	        getDB().endTransaction();
+	        PROF.STOP("DB");
+
+	        getNotify().fireObjectsNotification();
+	    }
+
 		PROF.START("Data1");
-		if ( getCurPageCount() > 0 )
-	    	getNotify().fireSyncNotification(this, false, RhoRuby.ERR_NONE, "");
+	    if ( getCurPageCount() > 0 )
+	        getNotify().fireSyncNotification(this, false, RhoRuby.ERR_NONE, "");
 		PROF.STOP("Data1");
 	}
+	
+	void processSyncCommand(String strCmd, JSONEntry oCmdEntry)throws Exception
+	{
+	    JSONStructIterator objIter = new JSONStructIterator(oCmdEntry);
+
+	    for( ; !objIter.isEnd() && getSync().isContinueSync(); objIter.next() )
+	    {
+	        String strObject = objIter.getCurKey();
+	        JSONStructIterator attrIter = new JSONStructIterator( objIter.getCurValue() );
+	        if ( m_bSchemaSource )
+	            processServerCmd_Ver3_Schema(strCmd,strObject,attrIter);
+	        else
+	        {
+	            for( ; !attrIter.isEnd() && getSync().isContinueSync(); attrIter.next() )
+	            {
+	                String strAttrib = attrIter.getCurKey();
+	                String strValue = attrIter.getCurString();
+
+	                processServerCmd_Ver3(strCmd,strObject,strAttrib,strValue);
+	            }
+	        }
 
-	boolean processSyncObject_ver1(JSONEntry oJsonObject, Integer nSrcID)throws Exception
+	        int nSyncObjectCount  = getNotify().incLastSyncObjectCount(getID());
+	        if ( getProgressStep() > 0 && (nSyncObjectCount%getProgressStep() == 0) )
+	            getNotify().fireSyncNotification(this, false, RhoRuby.ERR_NONE, "");
+	        
+	        if ( getDB().isUIWaitDB() )
+	        {
+		        LOG.INFO("Commit transaction because of UI request.");
+	            getDB().endTransaction();
+	            SyncThread.getInstance().sleep(1000);
+	            getDB().startTransaction();
+	        }
+	    }
+	}
+	
+	void processLinks(String strOldObject, String strNewObject)throws Exception
 	{
-		String strOldObject = oJsonObject.getString("oo");
-	    if ( isDeleteObjectsPass() != (nSrcID.intValue() < 0) )
-	    	return true;
-	    
-	    if ( oJsonObject.hasName("e") )
+    	Enumeration vals = m_hashLinks.elements();
+    	Enumeration keys = m_hashLinks.keys();
+		while (vals.hasMoreElements()) 
+		{
+	        SyncSource pSrc = getSync().findSourceByName((String)keys.nextElement());
+	        if ( pSrc != null )
+	            pSrc.updateLink(strOldObject, strNewObject, (String)vals.nextElement());
+	    }
+	}
+
+	void updateLink(String strOldObject, String strNewObject, String strAttrib)throws Exception
+	{
+	    if ( m_bSchemaSource )
 	    {
-	    	String strError = oJsonObject.getString("e");
-	        getNotify().addCreateObjectError(nSrcID,strOldObject,strError);
-	        return true;
+	        String strSqlUpdate = "UPDATE ";
+	        strSqlUpdate += getName() + " SET " + strAttrib + "=? where " + strAttrib + "=?";
+
+	        getDB().executeSQL(strSqlUpdate, strNewObject, strOldObject );
 	    }
+	    else
+	        getDB().executeSQL("UPDATE object_values SET value=? where attrib=? and source_id=? and value=?", 
+	            strNewObject, strAttrib, getID(), strOldObject );
 
-		String strObject = oJsonObject.getString("o");
-		JSONArrayIterator oJsonArr = new JSONArrayIterator(oJsonObject, "av");
-	    //oo conflicts
-	    boolean bUpdatedOO = false;
-	    //
-	    for( ; !oJsonArr.isEnd() && getSync().isContinueSync(); m_nAttribCounter++, oJsonArr.next() )
-		{
-			JSONEntry oJsonEntry = oJsonArr.getCurItem();
-	        if ( oJsonEntry.isEmpty() )
-	        	continue;
+	    getDB().executeSQL("UPDATE changed_values SET value=? where attrib=? and source_id=? and value=?", 
+	        strNewObject, strAttrib, getID(), strOldObject );
+	}
+	
+	void processServerCmd_Ver3_Schema(String strCmd, String strObject, JSONStructIterator attrIter)throws Exception
+	{
+	    if ( strCmd.compareTo("insert") == 0 )
+	    {
+	        Vector/*<String>*/ vecValues = new Vector(), vecAttrs = new Vector();
+	        String strCols = "", strQuest = "", strSet = "";
+	        for( ; !attrIter.isEnd() && getSync().isContinueSync(); attrIter.next() )
+	        {
+	            CAttrValue oAttrValue = new CAttrValue(attrIter.getCurKey(),attrIter.getCurString());
+	            if ( !processBlob(strCmd,strObject,oAttrValue) )
+	                continue;
+	        	
+	            if ( strCols.length() > 0 )
+	                strCols += ",";
+	            if ( strQuest.length() > 0)
+	                strQuest += ",";
+	            if ( strSet.length() > 0)
+	                strSet += ",";
+
+	            strCols += oAttrValue.m_strAttrib;
+	            strQuest += "?";
+	            strSet += oAttrValue.m_strAttrib + "=?";
+	            vecAttrs.addElement(oAttrValue.m_strAttrib);
+	            vecValues.addElement(oAttrValue.m_strValue);
+	        }
+	        vecValues.addElement(strObject);
+	        if ( strCols.length() > 0 )
+	            strCols += ",";
+	        if ( strQuest.length() > 0)
+	            strQuest += ",";
 	        
-		    if ( nSrcID.intValue() >= 0 ) //insert
-		    {
-		    	CValue value = new CValue(oJsonEntry,1);
-		    	if ( !downloadBlob(value) )
-		    		return false;
-		    	
-		    	String strAttrib = oJsonEntry.getString("a");
-	            //oo conflicts
-	            if ( strOldObject != null && !bUpdatedOO )
+	        strCols += "object";
+	        strQuest += "?";
+
+	        String strSqlInsert = "INSERT INTO ";
+	        strSqlInsert += getName() + " (";
+	        strSqlInsert += strCols + ") VALUES(" + strQuest + ")";
+
+	        if ( !getSync().isContinueSync() )
+	            return;
+	        
+	        IDBResult resInsert = getDB().executeSQLReportNonUniqueEx(strSqlInsert, vecValues );
+	        if ( resInsert.isNonUnique() )
+	        {
+	            String strSqlUpdate = "UPDATE ";
+	            strSqlUpdate += getName() + " SET " + strSet + " WHERE object=?";
+	            getDB().executeSQLEx(strSqlUpdate, vecValues);
+
+	            // oo conflicts
+	            for( int i = 0; i < (int)vecAttrs.size(); i++ )
 	            {
-                    getDB().executeSQL("UPDATE object_values SET object=? where object=? and source_id=?", strObject, strOldObject, nSrcID );
-                    getDB().executeSQL("UPDATE changed_values SET object=? where object=? and source_id=?", strObject, strOldObject, nSrcID );
+	                getDB().executeSQL("UPDATE changed_values SET sent=4 where object=? and attrib=? and source_id=? and sent>1", 
+	                    strObject, vecAttrs.elementAt(i), getID() );
+	            }
+	            //
+	        }
+
+	        getNotify().onObjectChanged(getID(),strObject, SyncNotify.enUpdate);
+	        m_nInserted++;
+	    }else if (strCmd.compareTo("delete") == 0)
+	    {
+	    	Vector/*<String>*/ vecAttrs = new Vector();
+	        String strSet = "";
+	        for( ; !attrIter.isEnd() && getSync().isContinueSync(); attrIter.next() )
+	        {
+	        	CAttrValue oAttrValue = new CAttrValue(attrIter.getCurKey(),attrIter.getCurString());
+	        	
+	            if ( strSet.length() > 0 )
+	                strSet += ",";
 
-                    getNotify().onObjectChanged(nSrcID,strOldObject, SyncNotify.enCreate);
+	            vecAttrs.addElement(oAttrValue.m_strAttrib);
+	            strSet += oAttrValue.m_strAttrib + "=NULL";
+	        }
 
-                    bUpdatedOO = true;
+	        String strSqlUpdate = "UPDATE ";
+	        strSqlUpdate += getName() + " SET " + strSet + " WHERE object=?";
+	        
+	        if ( strSet.length() == 0 || !getSync().isContinueSync() )
+	            return;
+	        
+	        getDB().executeSQL(strSqlUpdate, strObject);
+	        //Remove item if all nulls
+	        String strSelect = "SELECT * FROM " + getName() + " WHERE object=?";
+	        IDBResult res = getDB().executeSQL( strSelect, strObject );
+	        if ( !res.isEnd() )
+	        {
+	            boolean bAllNulls = true;
+	            for( int i = 0; i < res.getColCount(); i ++)
+	            {
+	                if ( !res.isNullByIdx(i) && res.getColName(i).compareTo("object")!=0 )
+	                {
+	                    bAllNulls = false;
+	                    break;
+	                }
 	            }
-	            
-                IDBResult resInsert = getDB().executeSQLReportNonUnique("INSERT INTO object_values "+
-                    "(id, attrib, source_id, object, value, attrib_type) VALUES(?,?,?,?,?,?)", 
-                    value.m_nID, strAttrib, nSrcID, strObject,
-                    value.m_strValue, value.m_strAttrType );
-                if ( resInsert.isNonUnique() )
-                {
-                    getDB().executeSQL("UPDATE object_values "+
-                        "SET id=?, value=?, attrib_type=? WHERE object=? and attrib=? and source_id=?", 
-                        value.m_nID, value.m_strValue, value.m_strAttrType,
-                        strObject, strAttrib, nSrcID );
-
-                    // oo conflicts
-                    getDB().executeSQL("UPDATE changed_values SET main_id=? where object=? and attrib=? and source_id=? and sent<=1", value.m_nID, strObject, strAttrib, nSrcID );
-                    getDB().executeSQL("UPDATE changed_values SET sent=4 where object=? and attrib=? and source_id=? and sent>1", strObject, strAttrib, nSrcID );
-                    //
-                }
-
-                getNotify().onObjectChanged(nSrcID,strObject, SyncNotify.enUpdate);
-		    	
-		        m_nInserted++;
-		    }else
-		    {
-		    	long id = oJsonEntry.getLong("i");
-		    	
-	            IDBResult res = getDB().executeSQL("SELECT source_id, object FROM object_values where id=?", id );
-	            if ( !res.isEnd() )
+
+	            if (bAllNulls)
 	            {
-	            	LOG.TRACE("Delete: " + id);
-	                Integer nDelSrcID = new Integer(res.getIntByIdx(0));
-	                String strDelObject = res.getStringByIdx(1);
-	                getDB().executeSQL("DELETE FROM object_values where id=?", id );
-	                getNotify().onObjectChanged(nDelSrcID, strDelObject, SyncNotify.enDelete);
+	                String strDelete = "DELETE FROM " + getName() + " WHERE object=?";
+	                getDB().executeSQL( strDelete, strObject);
 	            }
-                // oo conflicts
-                getDB().executeSQL("UPDATE changed_values SET sent=3 where main_id=?", id );
-                //
-	            
-		        m_nDeleted++;
-		    }
-		}
-		
-		return true;
+	        }
+	        
+	        getNotify().onObjectChanged(getID(), strObject, SyncNotify.enDelete);
+	        // oo conflicts
+	        for( int i = 0; i < (int)vecAttrs.size(); i++ )
+	        {
+	            getDB().executeSQL("UPDATE changed_values SET sent=3 where object=? and attrib=? and source_id=?", 
+	                strObject, vecAttrs.elementAt(i), getID() );
+	        }
+	        //
+
+	        m_nDeleted++;
+	    }else if ( strCmd.compareTo("links") == 0 )
+	    {
+	        String strValue = attrIter.getCurString();
+	        processLinks(strObject, strValue);
+	        
+	        String strSqlUpdate = "UPDATE ";
+	        strSqlUpdate += getName() + " SET object=? WHERE object=?";
+	        getDB().executeSQL(strSqlUpdate, strValue, strObject);
+
+	        getDB().executeSQL("UPDATE changed_values SET object=?,sent=3 where object=? and source_id=?", strValue, strObject, getID() );
+	        getNotify().onObjectChanged(getID(), strObject, SyncNotify.enCreate);
+	    }
+
 	}
 	
-	void processServerData_Ver1(JSONArrayIterator oJsonArr)throws Exception
+	boolean processBlob( String strCmd, String strObject, CAttrValue oAttrValue )throws Exception
 	{
-	    for( ; !oJsonArr.isEnd() && getSync().isContinueSync(); oJsonArr.next() )
-	    {
-	        JSONEntry oJsonSource = oJsonArr.getCurItem();
-	        String strSrcName = oJsonSource.getString("s");
-	        Integer nSrcID = getID();
-	        if ( strSrcName.compareTo("RhoDeleteSource") == 0 )
-	            nSrcID = new Integer(-1);
-	        else if ( strSrcName.compareTo(getName()) != 0 )
+	    //TODO: when server return delete with rhoblob postfix - delete isBlobAttr
+	    if ( !(oAttrValue.m_strBlobSuffix.length() > 0 || getDB().getAttrMgr().isBlobAttr(getID(), oAttrValue.m_strAttrib)) )
+	        return true;
+
+	    boolean bDownload = true;
+	    String strDbValue = "";
+	    if ( !getDB().getAttrMgr().isOverwriteBlobFromServer(getID(), oAttrValue.m_strAttrib) )
+	    {
+	        if ( m_bSchemaSource )
 	        {
-	            SyncSource pSrc = getSync().findSourceByName(strSrcName);
-	            if ( pSrc == null )
+	            String strSelect = "SELECT " + oAttrValue.m_strAttrib + " FROM " + getName() + " WHERE object=?";
+	            IDBResult res = getDB().executeSQL( strSelect, strObject);
+	            if (!res.isEnd())
 	            {
-	                LOG.ERROR("Sync server send data for unknown source name:" + strSrcName);
-	                getSync().stopSync();
-	                m_nErrCode = RhoRuby.ERR_UNEXPECTEDSERVERRESPONSE;
-	                break;
+	                strDbValue = res.getStringByIdx(0);
+	                bDownload = strDbValue == null || strDbValue.length() == 0;
 	            }
-	            nSrcID = pSrc.getID();
-	        }
-
-	        JSONArrayIterator oJsonObjList = new JSONArrayIterator(oJsonSource, "ol");
-	        m_nAttribCounter = 0;
-	        for( ; !oJsonObjList.isEnd() && getSync().isContinueSync(); oJsonObjList.next() )
+	        }else
 	        {
-		        if ( getDB().isUIWaitDB() )//|| m_nAttribCounter >= 200 )
-		        {
-		        	if ( getDB().isUIWaitDB() )
-		        		LOG.INFO( "Commit transaction because of UI request." );
-		        	
-		            getDB().endTransaction();
-		            getDB().startTransaction();
-		            
-		            m_nAttribCounter = 0;
-		        }
-		
-		        JSONEntry oJsonObject = oJsonObjList.getCurItem();
-		        if( !processSyncObject_ver1(oJsonObject,nSrcID))
+	            IDBResult res = getDB().executeSQL(
+	                "SELECT value FROM object_values WHERE object=? and attrib=? and source_id=?",
+	                strObject, oAttrValue.m_strAttrib, getID() );
+	            if (!res.isEnd())
 	            {
-		            getSync().stopSync();
-		            break;
+	                strDbValue = res.getStringByIdx(0);
+	                bDownload = strDbValue == null || strDbValue.length() == 0;
 	            }
-		        
-		        if ( !isDeleteObjectsPass() && nSrcID.intValue() >=0 )
-		        {
-	                int nSyncObjectCount  = getNotify().incLastSyncObjectCount(nSrcID);
+	        }
+	    }
 
-	                if ( getProgressStep() > 0 && (nSyncObjectCount%getProgressStep() == 0) )
-	                    getNotify().fireSyncNotification(this, false, RhoRuby.ERR_NONE, "");
-		        }
-		        
-		        m_bGetAtLeastOnePage = true;
+	    if ( bDownload )
+	    {
+	    	boolean bRes = false;
+	        getDB().endTransaction();
+	        try{
+	        	bRes = downloadBlob(oAttrValue);
+	        }finally
+	        {
+	        	getDB().startTransaction();
 	        }
+	        
+	        return bRes;
 	    }
+	    
+	    String fName = makeFileName( oAttrValue );	  
+	    String fOldName = RhodesApp.getInstance().resolveDBFilesPath(strDbValue);
+	    RhoClassFactory.createFile().renameOverwrite(fOldName, fName); 
+	    
+	    oAttrValue.m_strValue = FilePath.getRelativePath( fName, RhodesApp.getInstance().getRhoRootPath());
+	    return true;
 	}
 	
-	class CValue
+	void processServerCmd_Ver3(String strCmd, String strObject, String strAttriba, String strValuea)throws Exception
 	{
-	    String m_strValue;
-		String m_strAttrType;
-		Long   m_nID;
-		
-		CValue(JSONEntry oJsonEntry)throws JSONException
-		{
-			m_strValue = oJsonEntry.getString("value");
-			m_strAttrType = oJsonEntry.getString("attrib_type");
-			m_nID = new Long(oJsonEntry.getLong("id"));
-		}
-		CValue(JSONEntry oJsonEntry, int nVer)throws JSONException
-		{
-			if ( nVer == 1 )
-			{
-				m_strValue = oJsonEntry.getString("v");
-				m_strAttrType = oJsonEntry.getString("t");
-				m_nID = new Long(oJsonEntry.getLong("i"));
-			}
-		}
+	    CAttrValue oAttrValue = new CAttrValue(strAttriba,strValuea);
 		
+	    if ( strCmd.compareTo("insert") == 0 )
+	    {
+	        if ( !processBlob(strCmd,strObject,oAttrValue) )
+	            return;
+	        
+	        IDBResult resInsert = getDB().executeSQLReportNonUnique("INSERT INTO object_values "+
+	                "(attrib, source_id, object, value) VALUES(?,?,?,?)", 
+	                oAttrValue.m_strAttrib, getID(), strObject, oAttrValue.m_strValue );
+	        
+	        if ( resInsert.isNonUnique() )
+	        {
+	            getDB().executeSQL("UPDATE object_values " +
+                    "SET value=? WHERE object=? and attrib=? and source_id=?", 
+                     oAttrValue.m_strValue, strObject, oAttrValue.m_strAttrib, getID() );
+
+	            // oo conflicts
+	            getDB().executeSQL("UPDATE changed_values SET sent=4 where object=? and attrib=? and source_id=? and sent>1", 
+	                    strObject, oAttrValue.m_strAttrib, getID() );
+	            //
+	        }
+
+	        getNotify().onObjectChanged(getID(),strObject, SyncNotify.enUpdate);
+	        m_nInserted++;
+	    }else if (strCmd.compareTo("delete") == 0)
+	    {
+	        getDB().executeSQL("DELETE FROM object_values where object=? and attrib=? and source_id=?", strObject, oAttrValue.m_strAttrib, getID() );
+	        getNotify().onObjectChanged(getID(), strObject, SyncNotify.enDelete);
+	        // oo conflicts
+	        getDB().executeSQL("UPDATE changed_values SET sent=3 where object=? and attrib=? and source_id=?", strObject, oAttrValue.m_strAttrib, getID() );
+	        //
+
+	        m_nDeleted++;
+	    }else if ( strCmd.compareTo("links") == 0 )
+	    {
+	        processLinks(strObject, oAttrValue.m_strValue);
+
+	        getDB().executeSQL("UPDATE object_values SET object=? where object=? and source_id=?", oAttrValue.m_strValue, strObject, getID() );
+	        getDB().executeSQL("UPDATE changed_values SET object=?,sent=3 where object=? and source_id=?", oAttrValue.m_strValue, strObject, getID() );
+
+	        getNotify().onObjectChanged(getID(), strObject, SyncNotify.enCreate);
+	    }
+
 	}
 	
-	private String makeFileName(CValue value)throws Exception
+	private String makeFileName(CAttrValue value)throws Exception
 	{
-		String fName = DBAdapter.makeBlobFolderName();
-		
 		String strExt = ".bin";
 		URI uri = new URI(value.m_strValue);
 		int nDot = uri.getPath().lastIndexOf('.');
@@ -752,17 +899,13 @@ class SyncSource
 			}
 		}
 		
-		//TODO: add join method to Rho::FilePath
-		fName += "id_" + value.m_nID.toString() + strExt;
+		String fName = RhodesApp.getInstance().getBlobsDirPath() + "/id_" + TimeInterval.getCurrentTime().toULong() + strExt;
 		
 		return fName;
 	}
 	
-	boolean downloadBlob(CValue value)throws Exception
+	boolean downloadBlob(CAttrValue value)throws Exception
 	{
-		if ( value.m_strAttrType == null || !value.m_strAttrType.equals("blob.url")  )
-			return true;
-		
 		String fName = makeFileName( value );
 		String url = value.m_strValue;
 		int nQuest = url.lastIndexOf('?');
@@ -776,8 +919,8 @@ class SyncSource
 			NetResponse resp = getNet().pullFile(url, fName, getSync(), null);
 	        if ( !resp.isOK() )
 	        {
-	        	m_nErrCode = RhoRuby.ERR_REMOTESERVER;
-	        	//m_strError = resp.getCharData();
+	        	getSync().stopSync();
+	        	m_nErrCode = RhoRuby.getErrorFromResponse(resp);
 	        	return false;
 	        }
 	    }catch(Exception exc)
@@ -786,11 +929,7 @@ class SyncSource
 	    	throw exc;
 	    }
         
-        value.m_strAttrType = "blob.file";
-        
-    	String root = RhoClassFactory.createFile().getDirPath("");
-        
-        value.m_strValue = "/" + fName.substring(root.length());
+	    value.m_strValue = FilePath.getRelativePath( fName, RhodesApp.getInstance().getRhoRootPath());
         
         return true;
 	}