rhodes 1.5.5 → 2.0.0.beta1

data/platform/shared/rubyJVM/src/com/rho/db/DBAttrManager.java

@@ -10,12 +10,13 @@ import com.rho.RhoRuby;
 public class DBAttrManager {
     private Mutex m_mxSrcAttrs = new Mutex();
     private Hashtable/*< int, Hashtable<String,int>* >*/ m_mapSrcAttrs = new Hashtable();
+    private Hashtable/*Ptr< int, Hashtable<String,int>* >*/ m_mapBlobAttrs = new Hashtable();
+    private Hashtable/*Ptr< String, int>*/ m_mapSrcNames = new Hashtable();
 
-    public void add( int iSrcID, String szAttr )
+    public void add( Integer nSrcID, String szAttr )
     {
     	synchronized(m_mxSrcAttrs)
     	{
-    		Integer nSrcID = new Integer(iSrcID);
 	        Hashtable/*<String,int>*/ mapAttr = (Hashtable)m_mapSrcAttrs.get(nSrcID);
 	        if ( mapAttr != null )
 	        {
@@ -33,11 +34,10 @@ public class DBAttrManager {
     	}
     }
 
-    public void remove( int iSrcID, String szAttr )
+    public void remove( Integer nSrcID, String szAttr )
     {
     	synchronized(m_mxSrcAttrs)
     	{
-    		Integer nSrcID = new Integer(iSrcID);
 	        Hashtable/*<String,int>*/ mapAttr = (Hashtable)m_mapSrcAttrs.get(nSrcID);
 	        if ( mapAttr != null )
 	        {
@@ -88,34 +88,7 @@ public class DBAttrManager {
     {
     	synchronized(m_mxSrcAttrs)
     	{
-	        IDBResult res = db.executeSQL("SELECT source_id,source_attribs from sources");
-	        for ( ; !res.isEnd(); res.next() )
-	        { 
-	            Integer nSrcID = new Integer(res.getIntByIdx(0));
-	            String strAttribs = res.getStringByIdx(1);
-	            if ( strAttribs.length() == 0 )
-	                continue;
-	
-	            Tokenizer oTokenizer = new Tokenizer( strAttribs, "," );
-	
-	            Hashtable/*<String,int>*/ mapAttr = new Hashtable/*<String,int>*/();
-	            String strAttr = "";
-	    		while (oTokenizer.hasMoreTokens()) 
-	            {
-	    			String tok = oTokenizer.nextToken();
-	    			if (tok.length() == 0)
-	    				continue;
-	                
-	                if ( strAttr.length() > 0 )
-	                {
-	                    mapAttr.put(strAttr, new Integer(Integer.parseInt(tok)) );
-	                    strAttr = "";
-	                }else
-	                    strAttr = tok;
-	            }
-	
-	            m_mapSrcAttrs.put( nSrcID, mapAttr );
-	        }
+    		loadAttrs(db, m_mapSrcAttrs, "source_attribs", null);
     	}
     }
 
@@ -149,5 +122,80 @@ public class DBAttrManager {
 
 	        return arRes;
     	}
-    }  
+    }
+
+    public boolean isBlobAttr(Integer nSrcID, String szAttr)
+    {
+        Hashtable/*<String,int>**/ mapAttr = (Hashtable)m_mapBlobAttrs.get(nSrcID);
+        if ( mapAttr != null )
+            return mapAttr.containsKey(szAttr);
+
+        return false;
+    }
+
+    public Integer getSrcIDHasBlobsByName(String strName)
+    {
+    	Integer nSrcID = (Integer)m_mapSrcNames.get(strName);
+    	if ( nSrcID == null )
+    		return null;
+
+        Hashtable/*<String,int>**/ mapAttr = (Hashtable)m_mapBlobAttrs.get(nSrcID);
+        if ( mapAttr.size() == 0 )
+        	return null;
+        
+    	return nSrcID;
+    }
+    
+    public boolean isOverwriteBlobFromServer(Integer nSrcID, String strAttr)
+    {
+        Hashtable/*<String,int>**/ mapAttr = (Hashtable)m_mapBlobAttrs.get(nSrcID);
+        if ( mapAttr != null )
+            return ((Integer)mapAttr.get(strAttr)).intValue() != 0;
+
+        return false;
+    }
+
+    void loadBlobAttrs(DBAdapter db)throws DBException
+    {
+        loadAttrs(db, m_mapBlobAttrs, "blob_attribs", m_mapSrcNames);
+        //TODO: update/delete trigger for schema sources
+    }
+    
+    static void loadAttrs(DBAdapter db, Hashtable/*Ptr< int, Hashtable<String,int>* >&*/ mapAttrs, String strDBAttr, Hashtable mapSrcNames)throws DBException
+    {
+        mapAttrs.clear();
+        String strSql = "SELECT source_id,";
+        strSql += strDBAttr + ",name from sources";
+    	
+	    IDBResult res = db.executeSQL(strSql);
+	    for ( ; !res.isEnd(); res.next() )
+	    { 
+	        Integer nSrcID = new Integer(res.getIntByIdx(0));
+	        String strAttribs = res.getStringByIdx(1);
+	        if ( strAttribs.length() == 0 )
+	            continue;
+	
+	        Tokenizer oTokenizer = new Tokenizer( strAttribs, "," );
+	
+	        Hashtable/*<String,int>*/ mapAttr = new Hashtable/*<String,int>*/();
+	        String strAttr = "";
+			while (oTokenizer.hasMoreTokens()) 
+	        {
+				String tok = oTokenizer.nextToken();
+				if (tok.length() == 0)
+					continue;
+	            
+	            if ( strAttr.length() > 0 )
+	            {
+	                mapAttr.put(strAttr, new Integer(Integer.parseInt(tok)) );
+	                strAttr = "";
+	            }else
+	                strAttr = tok;
+	        }
+	
+			mapAttrs.put( nSrcID, mapAttr );
+			if ( mapSrcNames != null )
+				mapSrcNames.put(res.getStringByIdx(2).toUpperCase(), nSrcID);
+	    }
+    }
 }

data/platform/shared/rubyJVM/src/com/rho/db/IDBCallback.java

@@ -2,9 +2,7 @@ package com.rho.db;
 
 public interface IDBCallback 
 {
-	//public abstract void OnDeleteAll();
-	//public abstract void OnDeleteAllFromTable(String tableName);
-	public abstract void OnDeleteFromTable(String tableName, IDBResult rows2Delete);
-	public abstract void OnInsertIntoTable(String tableName, IDBResult rows2Insert);
-
+	public abstract void onBeforeDelete(String tableName, IDBResult rows2Delete);
+	public abstract void onBeforeUpdate(String tableName, IDBResult rows2Insert, int[] cols);
+	public abstract void onAfterInsert(String tableName, IDBResult rows2Insert);
 }

data/platform/shared/rubyJVM/src/com/rho/db/IDBResult.java

@@ -6,6 +6,7 @@ public interface IDBResult {
 	//public abstract int getCount();
 	public abstract int getColCount();
 	public abstract String getColName(int nCol);
+	public abstract String getOrigColName(int nCol);
 	/*
 	public abstract RubyValue getRubyValueByIdx(int nItem, int nCol);
 	public abstract long getLongByIdx(int nItem, int nCol);
@@ -28,6 +29,7 @@ public interface IDBResult {
 	public abstract String getUInt64ByIdx(int nCol);
 
 	public abstract RubyValue getRubyValueByIdx(int nCol);
+	public abstract boolean isNullByIdx(int nCol);
 	
 	public abstract RubyValue getRubyValue(String colname);
 	public abstract int getInt(String colname);

data/platform/shared/rubyJVM/src/com/rho/db/IDBStorage.java

@@ -6,6 +6,8 @@ public interface IDBStorage {
 	public abstract void close()throws DBException;
 	
 	public abstract IDBResult executeSQL(String strStatement, Object[] values, boolean bReportNonUnique)throws DBException;
+	public abstract void executeBatchSQL(String strStatement)throws DBException;
+	
 	public abstract IDBResult createResult();
 	
 	public abstract void deleteAllFiles(String strPath)throws Exception;

data/platform/shared/rubyJVM/src/com/rho/{IFile.java → file/IFile.java}

@@ -1,4 +1,4 @@
-package com.rho;
+package com.rho.file;
 
 import java.io.IOException;
 

data/platform/shared/rubyJVM/src/com/rho/{IFileAccess.java → file/IFileAccess.java}

@@ -1,4 +1,4 @@
-package com.rho;
+package com.rho.file;
 
 public interface IFileAccess {
 	public boolean exists(String name);

data/platform/shared/rubyJVM/src/com/rho/{IRAFile.java → file/IRAFile.java}

@@ -1,4 +1,4 @@
-package com.rho;
+package com.rho.file;
 
 import java.io.IOException;
 

data/platform/{bb/Hsqldb/src/com/rho/db → shared/rubyJVM/src/com/rho/file}/RandomAccessFile.java

@@ -1,4 +1,4 @@
-package com.rho.db;
+package com.rho.file;
 
 import java.io.*;
 
@@ -9,7 +9,6 @@ import javax.microedition.io.Connector;
 import com.rho.RhoClassFactory;
 //import com.rho.RhoEmptyLogger;
 //import com.rho.RhoLogger;
-import com.rho.IRAFile;
 
 import j2me.nio.channels.*;
 

data/platform/shared/rubyJVM/src/com/rho/{SimpleFile.java → file/SimpleFile.java}

@@ -1,4 +1,4 @@
-package com.rho;
+package com.rho.file;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,6 +27,8 @@ public interface SimpleFile extends IFile {
     void truncate(int nSize)throws IOException;
     InputStream getInputStream()throws IOException;
     OutputStream getOutStream();
+    OutputStream getOutStreamEx(long pos)throws IOException;    
+    long length();
     
     /**
      * 
@@ -43,4 +45,6 @@ public interface SimpleFile extends IFile {
     public abstract InputStream getResourceAsStream(Class fromClass, String path);
     
     public abstract void renameOverwrite(String oldName, String newName);
+    
+    public abstract void copyJarFileToMemory(String strFileName, InputStream jarStream)throws IOException;
 }

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

@@ -9,6 +9,7 @@ import java.util.Hashtable;
 
 import com.xruby.runtime.builtin.RubyArray;
 import com.xruby.runtime.lang.*;
+import com.rho.net.NetRequest.MultipartItem;
 
 import java.io.IOException;
 
@@ -148,8 +149,14 @@ public class AsyncHttp extends RhoThread
 		        break;
 	
 		    case hcUpload:
-		        m_pNetResponse = m_pNetRequest.pushFile(m_strUrl, m_strBody, null, m_mapHeaders);
-		        break;
+		    	{
+		            MultipartItem oItem = new MultipartItem();
+		            oItem.m_strFilePath = m_strBody;
+		            oItem.m_strContentType = "application/octet-stream";
+	
+		            m_pNetResponse = m_pNetRequest.pushMultipartData( m_strUrl, oItem, null, m_mapHeaders );
+			        break;
+		    	}
 		    }
 		    
 		    if ( !m_pNetRequest.isCancelled() )
@@ -237,13 +244,7 @@ public class AsyncHttp extends RhoThread
 		    else
 		    {
 		    	m_strResBody += "error&error_code=";
-		        /*if ( !resp.isResponseRecieved())
-		            strBody += RhoRuby.ERR_NETWORK;
-		        else */if ( resp.isUnathorized() )
-		        	m_strResBody += RhoRuby.ERR_UNATHORIZED;
-		        else
-		        	m_strResBody += RhoRuby.ERR_REMOTESERVER;
-	
+		    	m_strResBody += RhoRuby.getErrorFromResponse(resp);		    	
 		        //if ( resp.isResponseRecieved())
 		        m_strResBody += "&http_error=" + resp.getRespCode();
 		    }
@@ -280,14 +281,15 @@ public class AsyncHttp extends RhoThread
 		klass.getSingletonClass().defineMethod("do_get", new RubyVarArgMethod(){ 
 			protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block )
 			{
-				if ( args.size() != 4 )
+				if ( args.size() != 5 )
 					throw new RubyException(RubyRuntime.ArgumentErrorClass, 
-							"in AsyncHttp.do_get: wrong number of arguments ( " + args.size() + " for " + 4 + " )");			
+							"in AsyncHttp.do_get: wrong number of arguments ( " + args.size() + " for " + 5 + " )");			
 				
 				try {
 					String url = args.get(0).toStr();
 					String callback = args.get(2).toStr();
 					String callback_params = args.get(3).toStr();
+					boolean ssl_verify_peer = args.get(4).toInt() != 0 ? true : false;
 					AsyncHttp pHttp = new AsyncHttp(new RhoClassFactory(), AsyncHttp.hcGet, url, args.get(1), null, callback, callback_params );
 					return pHttp.getRetValue();
 				} catch(Exception e) {
@@ -300,15 +302,16 @@ public class AsyncHttp extends RhoThread
 		klass.getSingletonClass().defineMethod("do_post", new RubyVarArgMethod(){ 
 			protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block )
 			{
-				if ( args.size() != 5 )
+				if ( args.size() != 6 )
 					throw new RubyException(RubyRuntime.ArgumentErrorClass, 
-							"in AsyncHttp.do_post: wrong number of arguments ( " + args.size() + " for " + 5 + " )");			
+							"in AsyncHttp.do_post: wrong number of arguments ( " + args.size() + " for " + 6 + " )");			
 				
 				try {
 					String url = args.get(0).toStr();
 					String body = args.get(2).toStr();
 					String callback = args.get(3).toStr();
 					String callback_params = args.get(4).toStr();
+					boolean ssl_verify_peer = args.get(5).toInt() != 0 ? true : false;
 					AsyncHttp pHttp = new AsyncHttp(new RhoClassFactory(), AsyncHttp.hcPost, url, args.get(1), body, callback, callback_params );
 					return pHttp.getRetValue();
 				} catch(Exception e) {
@@ -321,15 +324,16 @@ public class AsyncHttp extends RhoThread
 		klass.getSingletonClass().defineMethod("do_downloadfile", new RubyVarArgMethod(){ 
 			protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block )
 			{
-				if ( args.size() != 5 )
+				if ( args.size() != 6 )
 					throw new RubyException(RubyRuntime.ArgumentErrorClass, 
-							"in AsyncHttp.do_downloadfile: wrong number of arguments ( " + args.size() + " for " + 5 + " )");			
+							"in AsyncHttp.do_downloadfile: wrong number of arguments ( " + args.size() + " for " + 6 + " )");			
 				
 				try {
 					String url = args.get(0).toStr();
 					String filepath = args.get(2).toStr();
 					String callback = args.get(3).toStr();
 					String callback_params = args.get(4).toStr();
+					boolean ssl_verify_peer = args.get(5).toInt() != 0 ? true : false;
 					AsyncHttp pHttp = new AsyncHttp(new RhoClassFactory(), AsyncHttp.hcDownload, url, args.get(1), filepath, callback, callback_params );
 					return pHttp.getRetValue();
 				} catch(Exception e) {
@@ -342,15 +346,16 @@ public class AsyncHttp extends RhoThread
 		klass.getSingletonClass().defineMethod("do_uploadfile", new RubyVarArgMethod(){ 
 			protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block )
 			{
-				if ( args.size() != 5 )
+				if ( args.size() != 6 )
 					throw new RubyException(RubyRuntime.ArgumentErrorClass, 
-							"in AsyncHttp.do_uploadfile: wrong number of arguments ( " + args.size() + " for " + 5 + " )");			
+							"in AsyncHttp.do_uploadfile: wrong number of arguments ( " + args.size() + " for " + 6 + " )");			
 				
 				try {
 					String url = args.get(0).toStr();
 					String filepath = args.get(2).toStr();
 					String callback = args.get(3).toStr();
 					String callback_params = args.get(4).toStr();
+					boolean ssl_verify_peer = args.get(5).toInt() != 0 ? true : false;
 					AsyncHttp pHttp = new AsyncHttp(new RhoClassFactory(), AsyncHttp.hcUpload, url, args.get(1), filepath, callback, callback_params );
 					return pHttp.getRetValue();
 				} catch(Exception e) {
@@ -376,4 +381,4 @@ public class AsyncHttp extends RhoThread
 
 	}
 	
-}
+}

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

@@ -13,68 +13,52 @@ import com.rho.IRhoRubyHelper;
 import com.rho.RhoConf;
 import com.rho.RhoEmptyLogger;
 import com.rho.RhoLogger;
-import com.rho.SimpleFile;
-import com.rho.IRAFile;
-import com.rho.Tokenizer;
+import com.rho.file.*;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
-
+import java.util.Vector;
 
 public class NetRequest
 {
 	private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
 		new RhoLogger("Net");
 	
-	static final int  MAX_NETREQUEST_RETRY  = 1;
 	boolean m_bCancel = false;
 	
 	public static interface IRhoSession
 	{
 		public abstract void logout()throws Exception;
 		public abstract String getSession();
+		public abstract String getContentType();
 	}
 	
+	public static class MultipartItem
+	{
+	    //mutually exclusive
+	    public String m_strFilePath = "";
+	    public String m_strBody = "";
+	    //
+
+	    public String m_strName = "", m_strFileName = "", m_strContentType = "";
+
+	    public String m_strDataPrefix = "";
+	};
+	
 	private IHttpConnection m_connection = null;
-	//private char[] m_charBuffer = new char[1024];
-	public  byte[]  m_byteBuffer = new byte[4096];
+	
 	private boolean m_bIgnoreSuffixOnSim = true;
 	private Hashtable m_OutHeaders;
 	public boolean isCancelled(){ return m_bCancel;}
 	public NetResponse pullData(String strUrl, IRhoSession oSession ) throws Exception
     {
-		return doRequestTry(strUrl, "", oSession);
+		return doRequest("GET", strUrl, "", oSession, null);
     }
 
 	public void setIgnoreSuffixOnSim(boolean bset)
 	{
 		m_bIgnoreSuffixOnSim = bset;
 	}
-	
-	private NetResponse doRequestTry(String strUrl, String strBody, IRhoSession oSession ) throws Exception
-    {
-		NetResponse resp = null;
-		
-		int nTry = 0;
-		m_bCancel = false;
-	    do
-	    {
-	    	try{
-	    		resp = doRequest(strBody != null && strBody.length() > 0 ? "POST" : "GET", strUrl, strBody, oSession, null);
-	    		break;
-	    	}catch(IOException exc)
-	    	{
-	    		if ( m_bCancel )
-	    			break;
-	    		if ( nTry+1 >= MAX_NETREQUEST_RETRY )
-	    			throw exc;
-	    	}
-	        nTry++;
-
-	    }while( true );
-		
-		return resp;
-    }
 
 	private void writeHeaders(Hashtable headers) throws Exception
 	{
@@ -133,6 +117,7 @@ public class NetRequest
 		OutputStream os = null;
 		int code = -1;
 		
+		m_bCancel = false;
 		try{
 			closeConnection();
 			m_connection = RhoClassFactory.getNetworkAccess().connect(strUrl, m_bIgnoreSuffixOnSim);
@@ -146,27 +131,34 @@ public class NetRequest
 					m_connection.setRequestProperty("Cookie", strSession );
 			}
 			
-			m_connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
 			//m_connection.setRequestProperty("Connection", "keep-alive");
 			//m_connection.setRequestProperty("Accept", "application/x-www-form-urlencoded,application/json,text/html");
 			
-			writeHeaders(headers);
-			LOG.INFO("writeHeaders done");
 			if ( strBody != null && strBody.length() > 0 )
 			{
-				m_connection.setRequestMethod(strMethod);
+				if ( oSession != null )
+					m_connection.setRequestProperty("Content-Type", oSession.getContentType());
+				else
+					m_connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+
+				writeHeaders(headers);
+				LOG.INFO("writeHeaders done");
+				m_connection.setRequestMethod(IHttpConnection.POST);
+				
 				os = m_connection.openOutputStream();
 				os.write(strBody.getBytes(), 0, strBody.length());
+				LOG.INFO("write body done");
 			}else
+			{
+				writeHeaders(headers);
 				m_connection.setRequestMethod(strMethod);
+			}
 			
-			LOG.INFO("write body done");
+			code = m_connection.getResponseCode();
+			LOG.INFO("getResponseCode : " + code);
 			
 			is = m_connection.openInputStream();
 			LOG.INFO("openInputStream done");
-			code = m_connection.getResponseCode();
-			
-			LOG.INFO("getResponseCode : " + code);
 			
 			if (code != IHttpConnection.HTTP_OK) 
 			{
@@ -222,6 +214,8 @@ public class NetRequest
 	
 	public NetResponse pushData(String strUrl, String strBody, IRhoSession oSession)throws Exception
     {
+		m_bCancel = false;
+		
 		if ( URI.isLocalHost(strUrl) )
 		{
 			IRhoRubyHelper helper = RhoClassFactory.createRhoRubyHelper();
@@ -231,24 +225,23 @@ public class NetRequest
 		return doRequest("POST", strUrl, strBody, oSession, null);
     }
 	
-	static class ParsedCookie {
-		String strAuth = "";
-		String strSession = "";
-	};
+    public NetResponse pushMultipartData(String strUrl, MultipartItem oItem, IRhoSession oSession, Hashtable/*<String,String>**/ pHeaders)throws Exception
+    {
+        Vector arItems = new Vector();
+        arItems.addElement(oItem);
 
+        return pushMultipartData(strUrl, arItems, oSession, pHeaders);
+    }
+	
 	public NetResponse pullCookies(String strUrl, String strBody, IRhoSession oSession)throws Exception
 	{
 		Hashtable headers = new Hashtable();
 		m_bIgnoreSuffixOnSim = false;
+		m_bCancel = false;
+    	
 		NetResponse resp = doRequest/*Try*/("POST", strUrl, strBody, oSession, headers);
 		if ( resp.isOK() )
 		{
-			//ParsedCookie cookie = makeCookie(headers);
-			//if ( cookie.strAuth.length() > 0 || cookie.strSession.length() >0 )
-				//resp.setCharData(cookie.strAuth + ";" + cookie.strSession + ";");
-			//else
-			//	resp.setCharData("");
-			
 			resp.setCharData(resp.getCookies());
 			LOG.INFO("pullCookies: " + resp.getCharData() );
 		}
@@ -256,61 +249,80 @@ public class NetRequest
 		return resp;
 	}
 	
-	static String szMultipartPrefix = 
-		   "------------A6174410D6AD474183FDE48F5662FCC5\r\n"+
-		   "Content-Disposition: form-data; name=\"blob\"; filename=\"doesnotmatter.png\"\r\n"+
-		   "Content-Type: application/octet-stream\r\n\r\n";
-		
 	static String szMultipartPostfix = 
 	    "\r\n------------A6174410D6AD474183FDE48F5662FCC5--";
 
 	static String szMultipartContType = 
 	    "multipart/form-data; boundary=----------A6174410D6AD474183FDE48F5662FCC5";
 
-	public NetResponse pushFile( String strUrl, String strFileName, IRhoSession oSession, Hashtable headers)throws Exception
+	void processMultipartItems( Vector/*Ptr<CMultipartItem*>&*/ arItems )throws Exception
 	{
-		SimpleFile file = null;
-		NetResponse resp = null;
-		
-		try{
-			file = RhoClassFactory.createFile();
-			file.open(strFileName, true, true);
-			if ( !file.isOpened() ){
-				LOG.ERROR("File not found: " + strFileName);
-				throw new RuntimeException("File not found:" + strFileName);
-			}
-			
-			int nTry = 0;
-			do{
-				try{
-					resp = pushFile1(strUrl, file, oSession, headers );
-					break;
-				}catch(IOException e)
-				{
-		    		if ( nTry+1 >= MAX_NETREQUEST_RETRY )
-		    			throw e;
-		    	}
-		        nTry++;
-			}while( true );
-			
-		}finally{
-			if ( file != null )
-				try{ file.close(); }catch(IOException e){}
-		}
-		
-		copyHashtable(m_OutHeaders, headers);
-		
-		return resp;
+	    for( int i = 0; i < (int)arItems.size(); i++ )
+	    {
+	        MultipartItem oItem = (MultipartItem)arItems.elementAt(i); 
+
+	        if ( oItem.m_strName.length() == 0 )
+	            oItem.m_strName = "blob";
+
+	        if ( oItem.m_strFileName.length() == 0 )
+	        {
+	            if ( oItem.m_strFilePath.length() > 0 )
+	            {
+	                FilePath oPath = new FilePath(oItem.m_strFilePath);
+	                oItem.m_strFileName = oPath.getBaseName();
+	            }
+	            //else
+	            //    oItem.m_strFileName = "doesnotmatter.txt";
+	        }
+
+	        oItem.m_strDataPrefix = i > 0 ? "\r\n" : "";
+	        oItem.m_strDataPrefix += 
+	            "------------A6174410D6AD474183FDE48F5662FCC5\r\n"+
+	            "Content-Disposition: form-data; name=\"";
+	        oItem.m_strDataPrefix += oItem.m_strName + "\"";
+	        if (oItem.m_strFileName.length()>0)
+	            oItem.m_strDataPrefix += "; filename=\"" + oItem.m_strFileName + "\"";
+	        oItem.m_strDataPrefix += "\r\n";
+	        if ( oItem.m_strContentType.length() > 0 )
+	            oItem.m_strDataPrefix += "Content-Type: " + oItem.m_strContentType + "\r\n";
+
+	        long nContentSize = 0;
+	        if ( oItem.m_strFilePath.length() > 0 )
+	        {
+	        	SimpleFile file = null;
+	    		try{
+	    			file = RhoClassFactory.createFile();
+	    			file.open(oItem.m_strFilePath, true, true);
+	    			nContentSize = file.length();
+	    			if ( !file.isOpened() ){
+	    				LOG.ERROR("File not found: " + oItem.m_strFilePath);
+	    				throw new RuntimeException("File not found:" + oItem.m_strFilePath);
+	    			}
+	    		}finally{
+	    			if ( file != null )
+	    				try{ file.close(); }catch(IOException e){}
+	    		}
+	        }
+	        else
+	            nContentSize = oItem.m_strBody.length();
+
+	        if ( oItem.m_strContentType.length() > 0 )
+	            oItem.m_strDataPrefix += "Content-Length: " + nContentSize + "\r\n";
+
+	        oItem.m_strDataPrefix += "\r\n";
+	    }
+
 	}
 	
-	private NetResponse pushFile1( String strUrl, SimpleFile file, IRhoSession oSession, Hashtable headers)throws Exception
+    public NetResponse pushMultipartData(String strUrl, Vector/*Ptr<CMultipartItem*>&*/ arItems, IRhoSession oSession, Hashtable/*<String,String>**/ headers)throws Exception
     {
 		String strRespBody = null;
 		InputStream is = null;
 		OutputStream os = null;
-		InputStream fis = null;
 		int code  = -1;
 		
+		m_bCancel = false;
+    	
 		try{
 			closeConnection();
 			m_connection = RhoClassFactory.getNetworkAccess().connect(strUrl, false);
@@ -322,26 +334,58 @@ public class NetRequest
 					m_connection.setRequestProperty("Cookie", strSession );
 			}
 			
+			m_connection.setRequestProperty("Connection", "keep-alive");
 			m_connection.setRequestProperty("content-type", szMultipartContType);
 			writeHeaders(headers);
 			m_connection.setRequestMethod(IHttpConnection.POST);
 			
 			//PUSH specific
+			processMultipartItems( arItems );
 			os = m_connection.openOutputStream();
-			os.write(szMultipartPrefix.getBytes(), 0, szMultipartPrefix.length());
-
-			fis = file.getInputStream();
-			synchronized (m_byteBuffer) {			
-				int nRead = 0;
-	    		do{
-	    			nRead = fis.read(m_byteBuffer);	    			
-	    			if ( nRead > 0 )
-	    				os.write(m_byteBuffer, 0, nRead);
-	    		}while( nRead > 0 );
-			}
-			
+	        //write all items
+	        for( int i = 0; i < (int)arItems.size(); i++ )
+	        {
+	            MultipartItem oItem = (MultipartItem)arItems.elementAt(i); 
+    			os.write(oItem.m_strDataPrefix.getBytes(), 0, oItem.m_strDataPrefix.length());
+
+	            if ( oItem.m_strFilePath.length() > 0 )
+	            {
+
+		        	SimpleFile file = null;
+		    		InputStream fis = null;
+		        	
+		    		try{
+		    			file = RhoClassFactory.createFile();
+		    			file.open(oItem.m_strFilePath, true, true);
+		        		
+		    			if ( !file.isOpened() ){
+		    				LOG.ERROR("File not found: " + oItem.m_strFilePath);
+		    				throw new RuntimeException("File not found:" + oItem.m_strFilePath);
+		    			}
+		    			
+		    			fis = file.getInputStream();
+		    			byte[]  byteBuffer = new byte[1024*4]; 
+		    			int nRead = 0;
+		        		do{
+		        			nRead = fis.read(byteBuffer);	    			
+		        			if ( nRead > 0 )
+		        				os.write(byteBuffer, 0, nRead);
+		        		}while( nRead > 0 );
+		    		}finally{
+						if (fis != null)
+							try{ fis.close(); }catch(IOException e){}
+		    			
+		    			if ( file != null )
+		    				try{ file.close(); }catch(IOException e){}
+		    		}
+	    			
+	            }else
+	            {
+	    			os.write(oItem.m_strBody.getBytes(), 0, oItem.m_strBody.length());
+	            }
+	        }
 			os.write(szMultipartPostfix.getBytes(), 0, szMultipartPostfix.length());
-			os.flush();
+			//os.flush();
 			//PUSH specific
 			
 			is = m_connection.openInputStream();
@@ -371,9 +415,6 @@ public class NetRequest
 			readHeaders(headers);			
 		}finally{
 			try{
-				if (fis != null)
-					fis.close();
-				
 				if ( is != null )
 					is.close();
 				if (os != null)
@@ -384,6 +425,7 @@ public class NetRequest
 			}catch(IOException exc2){}
 		}
 		
+		copyHashtable(m_OutHeaders, headers);
 		return makeResponse(strRespBody, code );
     }
 	
@@ -397,7 +439,8 @@ public class NetRequest
 		
 		m_nMaxPacketSize = RhoClassFactory.getNetworkAccess().getMaxPacketSize();
 		m_bFlushFileAfterWrite = RhoConf.getInstance().getBool("use_persistent_storage");
-			
+		m_bCancel = false;
+    	
 		try{
 
 	        if (!strFileName.startsWith("file:")) { 
@@ -413,19 +456,8 @@ public class NetRequest
 			file.open(strFileName, "rw");
 			file.seek(file.size());
 			
-			int nFailTry = 0;
 			do{
-
-				try{
-					resp = pullFile1( strUrl, file, file.size(), oSession, headers );
-				}catch(IOException e)
-				{
-		    		if ( m_bCancel || nFailTry+1 >= MAX_NETREQUEST_RETRY )
-		    			throw e;
-		    		
-		    		nFailTry++;
-		    		m_nCurDownloadSize = 1;
-		    	}
+				resp = pullFile1( strUrl, file, file.size(), oSession, headers );
 			}while( !m_bCancel && (resp == null || resp.isOK()) && m_nCurDownloadSize > 0 && m_nMaxPacketSize > 0 );
 			
 		}finally{
@@ -441,7 +473,6 @@ public class NetRequest
 		return resp != null && !m_bCancel ? resp : makeResponse("", IHttpConnection.HTTP_INTERNAL_ERROR );
 	}
 	
-	static byte[]  m_byteDownloadBuffer = new byte[1024*20]; 
 	NetResponse pullFile1( String strUrl, IRAFile file, long nStartPos, IRhoSession oSession, Hashtable headers )throws Exception
 	{
 		String strRespBody = null;
@@ -498,12 +529,13 @@ public class NetRequest
 					int nRead = 0;
 					
 					is = m_connection.openInputStream();
-					
+					byte[]  byteBuffer = new byte[1024*20]; 
+
 		    		do{
-		    			nRead = /*bufferedReadByByte(m_byteBuffer, is);*/is.read(m_byteDownloadBuffer);
+		    			nRead = /*bufferedReadByByte(m_byteBuffer, is);*/is.read(byteBuffer);
 		    			if ( nRead > 0 )
 		    			{
-		    				file.write(m_byteDownloadBuffer, 0, nRead);
+		    				file.write(byteBuffer, 0, nRead);
 		    				
 		    				if (m_bFlushFileAfterWrite)
 		    					file.sync();
@@ -573,62 +605,6 @@ public class NetRequest
 		m_bCancel = true;
 		closeConnection();
     }
-/*
-	private static void parseCookie(String value, ParsedCookie cookie) {
-		boolean bAuth = false;
-		boolean bSession = false;
-		Tokenizer stringtokenizer = new Tokenizer(value, ";");
-		while (stringtokenizer.hasMoreTokens()) {
-			String tok = stringtokenizer.nextToken();
-			tok = tok.trim();
-			if (tok.length() == 0) {
-				continue;
-			}
-			
-			int i = 0;
-			if ( (i=tok.indexOf("auth_token=")) >= 0 )
-			{
-				String val = tok.substring(i+11);
-				val.trim();
-				if ( val.length() > 0 )
-				{
-					cookie.strAuth = "auth_token=" + val;
-					bAuth = true;
-				}
-			}else if ( (i=tok.indexOf("path=")) >= 0 )
-			{
-				String val = tok.substring(i+6);
-				val.trim();
-				if ( val.length() > 0 )
-				{
-					if (bAuth)
-						cookie.strAuth += ";path=" + val;
-					else if (bSession)
-						cookie.strSession += ";path=" + val;
-				}
-			}else if ( (i=tok.indexOf("rhosync_session=")) >= 0 )
-			{
-				String val = tok.substring(i+16);
-				val.trim();
-				if ( val.length() > 0 )
-				{
-					cookie.strSession = "rhosync_session=" + val;
-					bSession = true;
-				}
-			}
-		}
-	}*/
-/*
-	private static String extractToc(String toc_name, String data) {
-		int start = data.indexOf(toc_name);
-		if (start != -1) {
-			int end = data.indexOf(';', start);
-			if (end != -1) {
-				return data.substring(start, end);
-			}
-		}
-		return null;
-	}*/
 
 	/*static{
 		TEST();
@@ -662,89 +638,30 @@ public class NetRequest
 				LOG.INFO("Set-Cookie: " + strValue);
 				
 				strRes += URI.parseCookie(strValue);
-				//parseCookie(strValue, cookie);
-				// Hack to make it work on 4.6 device which doesn't parse
-				// cookies correctly
-				// if (cookie.strAuth==null) {
-				// String auth = extractToc("auth_token", header_field);
-				// cookie.strAuth = auth;
-				// System.out.println("Extracted auth_token: " + auth);
-				// }
-				/*if (cookie.strSession == null) {
-					String rhosync_session = extractToc("rhosync_session", strValue);
-					cookie.strSession = rhosync_session;
-					LOG.INFO("Extracted rhosync_session: " + rhosync_session);
-				}*/
 			}
 		}
 
 		return strRes;
 	}
-/*	
-	private final StringBuffer readFully(InputStream in) throws Exception 
-	{
-		boolean bReadByBytes = false;
-		if ( RhoConf.getInstance().getInt("bb_netreadbybytes") > 0 )
-			bReadByBytes = RhoClassFactory.createRhoRubyHelper().isSimulator();
-		
-		StringBuffer buffer = new StringBuffer();
-		UTF8StreamReader reader = new UTF8StreamReader(4096,bReadByBytes);
-		reader.setInput(in);
-		while (true) {
-			synchronized (m_charBuffer) {
-				int len = reader.read(m_charBuffer);
-				if (len < 0) {
-					break;
-				}
-				buffer.append(m_charBuffer, 0, len);
-			}
-		}
-		return buffer;
-	}*/
 
 	private final String readFully(InputStream in) throws Exception 
 	{
 		String strRes = "";
-		synchronized (m_byteBuffer) {			
-			int nRead = 0;
-			do{
-				nRead = in.read(m_byteBuffer);
-				if (nRead>0)
-				{
-					String strTemp = new String(m_byteBuffer,0,nRead);
-					strRes += strTemp;
-				}
-			}while( nRead > 0 );
-		}
+		byte[]  byteBuffer = new byte[1024*4];
 		
-		return strRes;
-	}
-	/*
-	private final int bufferedRead(byte[] a, InputStream in) throws Exception {
-		int bytesRead = 0;
-		while (bytesRead < (a.length)) {
-			int read = in.read(a);//, bytesRead, (a.length - bytesRead));
-			if (read < 0) {
-				break;
+		int nRead = 0;
+		do{
+			nRead = in.read(byteBuffer);
+			if (nRead>0)
+			{
+				String strTemp = new String(byteBuffer,0,nRead);
+				strRes += strTemp;
 			}
-			bytesRead += read;
-		}
-		return bytesRead;
+		}while( nRead > 0 );
+		
+		return strRes;
 	}
 	
-	private final int bufferedReadByByte(byte[] a, InputStream in) throws IOException {
-		int bytesRead = 0;
-		while (bytesRead < (a.length)) {
-			int read = in.read();// a, 0, a.length );
-			if (read < 0) {
-				return bytesRead > 0 ? bytesRead : -1;
-			}
-			a[bytesRead] = (byte)read;
-			bytesRead ++;
-		}
-		return bytesRead;
-	}*/
-	
 	public void closeConnection(){
 		if ( m_connection != null ){
 			try{