rhodes 2.2.6 → 2.3.0.beta.1

data/platform/bb/RubyVM/src/com/rho/file/FileAccessBB.java

@@ -0,0 +1,109 @@
+package com.rho.file;
+
+import java.io.IOException;
+
+import com.rho.RhoClassFactory;
+
+public class FileAccessBB implements IFileAccess {
+	
+	private static IRAFile impl = null;
+
+    private void InitImpl() {
+    	if (impl == null) {
+    		try {
+    			impl = RhoClassFactory.createRAFile();
+    		}
+    		catch (Exception e) {
+    			System.out.println("FileAccessBB:InitImpl Exception: " + e.getMessage());
+    		}
+    	}
+    }
+	
+    public boolean exists(String filename) 
+    {
+    	InitImpl();
+    	synchronized (impl) {
+	    	try{
+	    		impl.open(filename);
+	    		return impl.exists();
+	    	}
+	    	catch (Exception exc) {
+	    		return false;
+	    	}
+	    	finally {
+	    		try {
+					impl.close();
+				} catch (Exception e) {
+					System.out.println("FileAccessBB:exists Exception on close: " + e.getMessage() + ";File: " + filename);
+				}
+	    	}
+    	}
+    }
+	
+    public long size(String filename) {
+    	InitImpl();
+    	synchronized (impl) {
+			try {
+				impl.open(filename);
+				return impl.size();
+			}
+			catch (Exception exc) {
+				return 0;
+			}
+			finally {
+				try {
+					impl.close();
+				}
+				catch (Exception e) {
+					System.out.println("FileAccessBB:size Exception on close: " + e.getMessage() + ";File: " + filename);
+				}
+			}
+		}
+    }
+	
+    public void delete(String filename)
+    {
+    	InitImpl();
+    	synchronized (impl) {
+	    	try {
+	    		impl.open(filename, "rw");
+	    		impl.delete();
+	    	}catch(Exception exc){
+	    		System.out.println("FileAccessBB:delete '" + filename + "' Exception: " + exc.getMessage());
+	    	}finally{
+	    		try {
+					impl.close();
+				} catch (IOException e) {
+					System.out.println("FileAccessBB:delete Exception on close: " + e.getMessage() + ";File: " + filename);
+				}
+	    	}
+    	}
+    }
+
+    public void renameOverwrite(String oldname, String newname) {
+
+    	InitImpl();
+    	synchronized (impl) {
+	        delete(newname);
+	    	try{
+	        	String name = newname;
+	        	int nSlash = newname.lastIndexOf('/');
+	        	if ( nSlash >= 0 )
+	        		name = newname.substring(nSlash+1);
+	        	
+	        	InitImpl();
+	        	impl.open(oldname, "rw");
+	        	impl.rename(name);
+	    	}catch(IOException exc){
+	    		System.out.println("FileAccessBB:renameOverwrite from '" + oldname + "' to '" + newname + "' Exception: " + exc.getMessage());
+	    	}finally{
+	    		try {
+					impl.close();
+				} catch (Exception e) {
+					System.out.println("FileAccessBB:rename Exception on close: " + e.getMessage() + ";From '" + oldname + "' to '" + newname + "'");
+				}
+	    	}
+    	}
+    }
+
+}

data/platform/bb/RubyVM/src/com/rho/file/RhoFile.java

@@ -0,0 +1,85 @@
+package com.rho.file;
+
+import com.rho.*;
+
+public class RhoFile 
+{
+	private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
+		new RhoLogger("RhoFile");
+
+	public static String readStringFromFile(String szFilePath)
+	{
+		String strRes = "";
+		IRAFile oFile = null; 
+			
+		try
+		{
+			oFile = RhoClassFactory.createRAFile();
+			oFile.open( szFilePath);
+			
+			int nSize = (int)oFile.size();
+		    byte[] data = new byte[nSize];
+		    int len = oFile.read(data, 0, nSize);
+		    if ( len > 0 )
+		    	strRes = new String(data,0,len);
+			
+		}catch(Exception exc)
+		{
+			LOG.ERROR("readStringFromFile failed.", exc);
+		}finally
+		{
+			if ( oFile != null )
+				try{ oFile.close();}catch(Exception e){}
+		}
+		
+		return strRes;
+	}
+	
+	public static String readStringFromJarFile(String szFilePath, Object root)
+	{
+		java.io.InputStream fstream = null;
+		String strFile = "";		
+		try {
+			fstream = RhoClassFactory.createFile().getResourceAsStream(root.getClass(),
+				 "/" + szFilePath);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		
+		if ( fstream == null )
+			return strFile;
+		 
+		try{
+			byte[] data = new byte[fstream.available()];
+			int len = fstream.read(data);
+			if ( len == 0 )
+				return strFile;
+			
+			strFile = new String(data,0,len);
+		}catch(java.io.IOException exc){
+		}
+		
+		try{fstream.close();}catch(java.io.IOException exc){}
+		
+		return strFile;
+	}
+	
+	public static boolean isFileExist(String szFilePath)
+	{
+		IRAFile oFile = null; 
+		
+		try
+		{
+			oFile = RhoClassFactory.createRAFile();
+			oFile.open(szFilePath);
+			return oFile.exists();
+		}catch(Exception exc)
+		{
+			return false;
+		}finally
+		{
+			if ( oFile != null )
+				try{ oFile.close();}catch(Exception e){}
+		}
+	}
+}

data/platform/bb/RubyVM/src/com/rho/net/NetRequest.java

@@ -54,8 +54,8 @@ public class NetRequest
 	public boolean isCancelled(){ return m_bCancel;}
 	
 	//TODO: use sslVerifyPeer
-    boolean sslVerifyPeer() {return m_sslVerifyPeer;}
-    void sslVerifyPeer(boolean mode) {m_sslVerifyPeer = mode;}
+    public boolean sslVerifyPeer() {return m_sslVerifyPeer;}
+    public void sslVerifyPeer(boolean mode) {m_sslVerifyPeer = mode;}
 	
 	public NetResponse pullData(String strUrl, IRhoSession oSession ) throws Exception
     {
@@ -96,7 +96,15 @@ public class NetRequest
 				if (strField != null ) 
 				{
 					String header_field = m_connection.getHeaderField(i);
-					m_OutHeaders.put(strField.toLowerCase(), header_field);
+					
+					String strKeyName = strField.toLowerCase();
+					if ( m_OutHeaders.containsKey(strKeyName))
+					{
+						header_field += ";" + m_OutHeaders.get(strKeyName);
+						m_OutHeaders.put(strKeyName, header_field);
+					}
+					else	
+						m_OutHeaders.put(strKeyName, header_field);
 				}
 			}
 		}
@@ -225,7 +233,7 @@ public class NetRequest
 	private NetResponse makeResponse(String strRespBody, int nErrorCode)throws Exception
 	{
 		NetResponse pResp = new NetResponse(strRespBody != null ? strRespBody : "", nErrorCode );
-		if (pResp.isOK())
+		if (pResp.isSuccess())
 			pResp.setCookies(makeClientCookie(m_OutHeaders));
 		
 		return pResp;

data/platform/bb/RubyVM/src/com/rho/net/NetResponse.java

@@ -37,6 +37,11 @@ public class NetResponse {
 		return m_nRespCode == IHttpConnection.HTTP_UNAUTHORIZED;
 	}
 	
+	public boolean isSuccess()
+	{
+		return m_nRespCode > 0 && m_nRespCode < 400;
+	}
+	
 	public void setCookies(String s)
     {
         m_strCookies = s;

data/platform/bb/RubyVM/src/com/rho/net/RhoConnection.java

@@ -26,7 +26,7 @@ public class RhoConnection implements IHttpConnection {
 		new RhoLogger("RhoConnection");
 	
 	/** Request URI **/
-	URI uri;
+	URI uri, uri_orig;
 	String  url_external;
 	
 	/** Method - GET, POST, HEAD **/
@@ -53,6 +53,7 @@ public class RhoConnection implements IHttpConnection {
     public RhoConnection(URI _uri) 
     {
     	url_external = _uri.toString();
+    	uri_orig = _uri;
     	uri = new URI(url_external);
     
     	if ( !uri.getPath().startsWith("/apps") )
@@ -137,13 +138,13 @@ public class RhoConnection implements IHttpConnection {
 	}
 
 	public String getHeaderField(String name) throws IOException {
-		LOG.TRACE("getHeaderField: " + name);
+		//LOG.TRACE("getHeaderField: " + name);
 		processRequest();
 		return resHeaders.getPropertyIgnoreCase(name);
 	}
 
 	public String getHeaderField(int index) throws IOException {
-		LOG.TRACE("getHeaderField: " + index);
+		//LOG.TRACE("getHeaderField: " + index);
 		processRequest();
         if (index >= resHeaders.size()) {
             return null;
@@ -152,7 +153,7 @@ public class RhoConnection implements IHttpConnection {
 	}
 
 	public long getHeaderFieldDate(String name, long def) throws IOException {
-		LOG.TRACE("getHeaderFieldDate: " + name);
+		//LOG.TRACE("getHeaderFieldDate: " + name);
 		processRequest();
         try {
             return DateTimeTokenizer.parse(getHeaderField(name));
@@ -167,7 +168,7 @@ public class RhoConnection implements IHttpConnection {
 	}
 
 	public int getHeaderFieldInt(String name, int def) throws IOException {
-		LOG.TRACE("getHeaderFieldInt: " + name);
+		//LOG.TRACE("getHeaderFieldInt: " + name);
 		processRequest();
         try {
             return Integer.parseInt(getHeaderField(name));
@@ -180,7 +181,7 @@ public class RhoConnection implements IHttpConnection {
 	}
 
 	public String getHeaderFieldKey(int index) throws IOException {
-		LOG.TRACE("getHeaderFieldKey: " + index);
+		//LOG.TRACE("getHeaderFieldKey: " + index);
 		processRequest();
         if (index >= resHeaders.size())
             return null;
@@ -223,7 +224,7 @@ public class RhoConnection implements IHttpConnection {
 	}
 
 	public String getRequestProperty(String key) {
-		LOG.TRACE("getRequestProperty: " + key);
+		//LOG.TRACE("getRequestProperty: " + key);
         return reqHeaders.getPropertyIgnoreCase(key);
 	}
 
@@ -265,7 +266,7 @@ public class RhoConnection implements IHttpConnection {
 	}
 
 	public void setRequestProperty(String key, String value) throws IOException {
-		LOG.TRACE("setRequestProperty: key = " + key + "; value = " + value);
+		//LOG.TRACE("setRequestProperty: key = " + key + "; value = " + value);
 		int index = 0;
 
 		/*
@@ -307,7 +308,7 @@ public class RhoConnection implements IHttpConnection {
 	 *            the value for the request header field.
 	 */
     protected void setRequestField(String key, String value) {
-    	LOG.TRACE("setRequestField: key = " + key + "; value = " + value);
+    	//LOG.TRACE("setRequestField: key = " + key + "; value = " + value);
 
         /*
 		 * If application setRequestProperties("Connection", "close") then we
@@ -662,6 +663,12 @@ public class RhoConnection implements IHttpConnection {
 			}else if ( model.equalsIgnoreCase("loadserversources") ){
 				RhoAppAdapter.loadServerSources(postData.toString());
 				return true;
+			}else if ( model.equalsIgnoreCase("loadallsyncsources") ){
+				RhoAppAdapter.loadAllSyncSources();
+				return true;
+			}else if ( model.equalsIgnoreCase("resetDBOnSyncUserChanged") ){
+				RhoAppAdapter.resetDBOnSyncUserChanged();
+				return true;
 			}
 
 		}else if ( application.equalsIgnoreCase("shared") )
@@ -783,24 +790,31 @@ public class RhoConnection implements IHttpConnection {
 			String strErr = "";
 			
 			LOG.TRACE("processRequest: " + getURL() );
-			
-			String strContType = getContentType();
-			if ( this.method.equals("POST") || strContType.length() == 0 )
+			String strReferer = reqHeaders != null ? reqHeaders.getPropertyIgnoreCase("Referer") : "";
+			if ( getRef() != null && getRef().length() > 0 && strReferer != null &&
+        		 strReferer.equalsIgnoreCase(uri_orig.getPathNoFragment()) )
 			{
-				if ( dispatch() )
+				respondNotModified();				
+			}else
+			{
+				String strContType = getContentType();
+				if ( this.method.equals("POST") || strContType.length() == 0 ||
+						strContType.indexOf("application/x-www-form-urlencoded") >= 0)
 				{
-					requestProcessed = true;
-					return;
+					if ( dispatch() )
+					{
+						requestProcessed = true;
+						return;
+					}
 				}
-			}
-			
-			if ( /*this.method == "GET" &&*/ httpGetFile(strContType) ){
 				
-			//}else if ( dispatch() ){
-			}else{
-				respondNotFound(strErr);
-			}
-			
+				if ( /*this.method == "GET" &&*/ httpGetFile(strContType) ){
+					
+				//}else if ( dispatch() ){
+				}else{
+					respondNotFound(strErr);
+				}
+			}			
 			requestProcessed = true;
 		}
 	}

data/platform/bb/RubyVM/src/com/rho/net/URI.java

@@ -800,6 +800,90 @@ import com.rho.Tokenizer;
     return schemespec.toString();
   }
 
+  public String getPathNoFragment() {
+	    StringBuffer schemespec = new StringBuffer();
+
+	    if (m_scheme != null) {
+	    	schemespec.append(m_scheme);
+	    	schemespec.append(':');
+	      }
+	    
+	    if (m_host != null || m_regAuthority != null) {
+	      schemespec.append("//");
+	    
+	      // Server based authority.
+	      if (m_host != null) {
+
+	        if (m_userinfo != null) {
+	          schemespec.append(m_userinfo);
+	          schemespec.append('@');
+	        }
+	        
+	        schemespec.append(m_host);
+	        
+	        if (m_port != -1) {
+	          schemespec.append(':');
+	          schemespec.append(m_port);
+	        }
+	      }
+	      // Registry based authority.
+	      else {
+	      	schemespec.append(m_regAuthority);
+	      }
+	    }
+
+	    if (m_path != null) {
+	      schemespec.append((m_path));
+	    }
+
+	    if (m_queryString != null) {
+	      schemespec.append('?');
+	      schemespec.append(m_queryString);
+	    }
+
+	    return schemespec.toString();
+	  }
+
+  public String getPathNoFragmentNoQuery() 
+  {
+	    StringBuffer schemespec = new StringBuffer();
+
+	    if (m_scheme != null) {
+	    	schemespec.append(m_scheme);
+	    	schemespec.append(':');
+	      }
+	    
+	    if (m_host != null || m_regAuthority != null) {
+	      schemespec.append("//");
+	    
+	      // Server based authority.
+	      if (m_host != null) {
+
+	        if (m_userinfo != null) {
+	          schemespec.append(m_userinfo);
+	          schemespec.append('@');
+	        }
+	        
+	        schemespec.append(m_host);
+	        
+	        if (m_port != -1) {
+	          schemespec.append(':');
+	          schemespec.append(m_port);
+	        }
+	      }
+	      // Registry based authority.
+	      else {
+	      	schemespec.append(m_regAuthority);
+	      }
+	    }
+
+	    if (m_path != null) {
+	      schemespec.append((m_path));
+	    }
+
+	    return schemespec.toString();
+  }
+  
   public String getHostSpecificPart() 
   {
     StringBuffer schemespec = new StringBuffer();

data/platform/bb/RubyVM/src/com/rho/sync/ClientRegister.java

@@ -119,7 +119,7 @@ public class ClientRegister extends RhoThread
 			return false;
     	
 		IDBResult res = DBAdapter.getUserDB().executeSQL("SELECT token,token_sent from client_info");
-        if ( !res.isEnd() ) {
+        if ( !res.isOneEnd() ) {
 			String token = res.getStringByIdx(0); 
 			int token_sent = res.getIntByIdx(1);
 			if ( m_strDevicePin.equals(token) && token_sent > 0 )