rhoconnect 3.4.5 → 4.0.0.beta.10

data/commands/utilities/blank_app.ru

@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby
+require 'rhoconnect/server'
+require 'rhoconnect/web-console/server'
+require 'resque/server'
+if defined?(JRUBY_VERSION)
+  require 'puma'
+else
+  require 'thin'
+end
+
+ROOT_PATH = File.expand_path('.')
+
+# Rhoconnect server flags
+# Rhoconnect::Server.enable  :stats
+Rhoconnect::Server.disable :run
+Rhoconnect::Server.disable :clean_trace
+Rhoconnect::Server.enable  :raise_errors
+Rhoconnect::Server.set     :root, ROOT_PATH
+Rhoconnect::Server.use     Rack::Static, :urls => ['/data'], :root => Rhoconnect::Server.root
+# Secret is stored in ~/.rhoconnect.yml
+secret = YAML.load_file(File.join(ENV['HOME'], '.rhoconnect.yml'))[Rhoconnect.environment][:secret]
+Rhoconnect::Server.set :secret, "#{secret}"
+
+# Disable Async mode if Debugger is used
+if ENV['DEBUG'] == 'yes'
+  Rhoconnect::Server.set :use_async_model, false
+end
+
+# Bootstrap the application
+Rhoconnect.bootstrap(ROOT_PATH)
+
+module Rhoconnect
+  def app
+    url_map = Rhoconnect.url_map
+    url_map['/resque'] = Resque::Server.new unless Rhoconnect.disable_resque_console
+    url_map['/console'] = RhoconnectConsole::Server.new unless Rhoconnect.disable_rc_console
+    
+    return Rack::URLMap.new url_map
+  end
+end
+
+class ApplicationController < Rhoconnect::Controller::AppBase
+  register Rhoconnect::EndPoint
+
+  post "/login", :rc_handler => :authenticate,
+                 :deprecated_route => {:verb => :post, :url => ['/application/clientlogin', '/api/application/clientlogin']} do
+    login, password = params[:login], params[:password]
+    true
+  end
+  get "/rps_login", :rc_handler => :rps_authenticate, :login_required => true do
+    login, password = params[:login], params[:password]
+    true
+  end
+end
+
+run Rhoconnect.app

data/commands/utilities/redis_runner.rb

@@ -1,3 +1,6 @@
+require 'redis'
+require 'socket'
+
 class RedisRunner
   def self.prefix
     "/usr/local/"
@@ -18,38 +21,58 @@ class RedisRunner
     '/tmp/redis.dtach'
   end
 
-  def self.running?
-    $redis_options ||= {}
-    Redis.new($redis_options).ping == 'PONG'
+  def self.local_ip?(address)
+    (address == "localhost") || (address == "127.0.0.1")
+  end
+
+  def self.running?(inst = nil)
+    host, port = "localhost", 6379
+    host, port = inst.split(':')[0..1] if inst
+    Redis.new(:host => host, :port => port).ping =~ /PONG/
   rescue
     false
   end
 
-  def self.start
+  def self.start(redis_array)
     if windows?
+      # TODO: There's no support for redis array on Windows.
+      # An alpha version of Redis 2.6 was released 01/22/2013 (https://github.com/MSOpenTech/redis)
+      puts "*** Warning: Redis array is not implemented on Windows" if redis_array.size > 1
       puts "Starting redis in a new window..."
       system "start #{File.join(redis_home,'redis-server')} #{File.join(redis_home,'redis.conf')}" rescue
         "redis-server not installed on your path, please install redis."
-    elsif defined?(JRUBY_VERSION)
-      puts "Starting redis ..."
-      system "redis-server #{redisconfdir}"
-    else
-      puts 'Detach with Ctrl+\  Re-attach with rhoconnect redis-attach'
-      sleep 1
-      command = "dtach -A #{dtach_socket} redis-server #{redisconfdir}"
+    elsif (redis_array.size == 1)
+      host, port = redis_array[0].split(':')[0..1]
+      puts "Starting redis server ..."
+      if defined?(JRUBY_VERSION)
+        command = "redis-server --port #{port} &"
+      else
+        puts 'Detach with Ctrl+\  Re-attach with rhoconnect redis-attach'
+        sleep 1
+        command = "dtach -A #{dtach_socket} redis-server --port #{port}"
+      end
       system command
+    else
+      puts "Starting redis servers ..."
+      redis_array.each do |cfg|
+        host, port = cfg.split(':')[0..1]
+        system("redis-server --port #{port} &") if RedisRunner.local_ip?(host)
+      end
     end
   end
 
   # this function is used with Rhostudio where there is no terminal
-  def self.startbg
+  def self.startbg(redis_array)
     if windows?
       puts "Starting redis in a new window..."
       system "start #{File.join(redis_home,'redis-server')} #{File.join(redis_home,'redis.conf')}" rescue
         "redis-server not installed on your path, please install redis."
     else
       puts "Starting redis ..."
-      system "redis-server #{redisconfdir} &"
+      redis_array.each do |cfg|
+        host, port = cfg.split(':')[0..1]
+        system("redis-server --port #{port} &") if RedisRunner.local_ip?(host)
+      end
     end
   end
 
@@ -57,14 +80,26 @@ class RedisRunner
     system "dtach -a #{dtach_socket}"
   end
 
-  def self.stop
-    $redis_options ||= {}
-    Redis.new($redis_options).shutdown rescue nil
+  def self.stop(redis_array)
+    if windows?
+      Redis.new.shutdown rescue nil
+    else
+      redis_array.each do |cfg|
+        host, port = cfg.split(':')[0..1]
+        Redis.new(:port => port).shutdown rescue nil if RedisRunner.local_ip?(host)
+      end
+    end
   end
 
-  def self.flushdb
-    $redis_options ||= {}
-    Redis.new($redis_options).flushdb rescue nil
+  def self.flushdb (redis_array)
+    if windows?
+      Redis.new.flushdb rescue nil
+    else
+      redis_array.each do |cfg|
+        host, port = cfg.split(':')[0..1]
+        Redis.new(:port => "#{port}").flushdb rescue nil if RedisRunner.local_ip?(host)
+      end
+    end
   end
 
 end

data/doc/authentication.txt

@@ -1,7 +1,7 @@
 Device Authentication in RhoConnect
 ===
 
-The generated RhoConnect application code includes a file at the root called "application.rb" which contains an "authenticate" hook.  This method is called when a device first connects to the RhoConnect application and provides username/password credentials.
+The generated RhoConnect application code includes a file called "application_controller.rb" which contains an implementation for the "login" route.  This route is called when a device first connects to the RhoConnect application and provides username/password credentials.
 
 ## Authentication Workflow
 	
@@ -10,10 +10,12 @@ The following diagram shows how this authenticate method is called:
 <img src="https://img.skitch.com/20110111-g2ujk785gak2kfgfrspq1w8u8j.png"/>
 
 ## Example
-If your backend service requires authentication, simply add code to the authenticate method and return true if authentication was successful or false to deny access to the application from this device.  For example:
+If your backend service requires authentication, simply add code to the login route and return true if authentication was successful or false to deny access to the application from this device.  For example:
 
 	:::ruby
-	def authenticate(username, password, session)
+	post "/login", :rc_handler => :authenticate do
+      username = params[:login]
+      password = params[:password]
 	  success = false 
 	  # ... connect to backend using API and authenticate ... 
 	  result = do_custom_authentication(username,password) 
@@ -29,8 +31,10 @@ If your backend service requires authentication, simply add code to the authenti
 If your actual user name is different than the username that is input into the client, you can change the username by returning a string instead of true if authentication was successful.
 
   	:::ruby
-	def authenticate(username, password, session)
-	  success = false 
+	post "/login", :rc_handler => :authenticate do
+      username = params[:login]
+      password = params[:password]
+      success = false 
 	  # ... connect to backend using API and authenticate ... 
 	  result = do_custom_authentication(username,password) 
 	  if result.code == 200
@@ -49,7 +53,9 @@ The code sample above demonstrates authentication by calling a method you would
 	:::ruby
 	require 'net/ldap'
 
-    def authenticate(username, password, session)
+    post "/login", :rc_handler => :authenticate do
+      username = params[:login]
+      password = params[:password]
       success = false 
       ldap = Net::LDAP.new
       ldap.host = "localhost"
@@ -74,3 +80,71 @@ This example uses the [net-ldap](https://github.com/RoryO/ruby-net-ldap) gem.  T
 	
 For more details about LDAP, please visit [http://www.openldap.org/](http://www.openldap.org/).
 
+## X509 Example
+The code sample below demonstrates using an X509 certificate for authentication.  See <a href='http://wiki.pentaho.com/display/ServerDoc2x/Authentication+via+X.509+Client+Certificate' target='_blank'>X509 certificate generation</a> for more information about generating a cert. You can also view a <a href='https://github.com/rhomobile/x509-auth-sample' target='_blank'>sample project</a> of the code below.
+
+
+Inside of your rhoconnect app you can replace the password parameter with a pem file parameter.  This parameter is expecting a string formatted for pem with your certificate followed by your private key.
+	:::ruby
+	
+	require 'socket'
+	require 'openssl'
+
+    post "/login", :rc_handler => :authenticate do
+      username = params[:login]
+      pem = params[:password]
+      #assuming pem file has certificate and then private key below in pem format
+      pem_arr = pem.split("-----END CERTIFICATE-----")
+      pem_arr[0] << "-----END CERTIFICATE-----"
+      
+      socket = TCPSocket.new('my.secureserver.com', 4567)
+
+      ssl_context = OpenSSL::SSL::SSLContext.new
+      
+      ssl_context.cert = OpenSSL::X509::Certificate.new(pem_arr[0].strip)
+      ssl_context.key = OpenSSL::PKey::RSA.new(pem_arr[1].strip)
+    
+      ssl_socket = OpenSSL::SSL::SSLSocket.new(socket, ssl_context)
+      ssl_socket.sync_close = true
+    
+      ca_cert = OpenSSL::X509::Certificate.new(File.open("CA.crt"))
+
+      if ssl_socket.connect
+        puts "socket connected correctly"
+        return true
+      else
+        puts "socket failed to connnect"
+        return false
+      end
+      
+    end
+
+A simple sinatra app listening on port 4567 for connections might look something like this.
+
+	:::ruby
+	require 'rubygems'
+	require 'socket'
+	require 'openssl'
+
+	socket = TCPServer.new('my.secureserver.com', 4567)
+
+	ssl_context = OpenSSL::SSL::SSLContext.new()
+	ssl_context.cert = OpenSSL::X509::Certificate.new(File.open("server.crt"))
+	ssl_context.key = OpenSSL::PKey::RSA.new(File.open("server.key"))
+
+	ca_cert = OpenSSL::X509::Certificate.new(File.open("CA.crt"))
+
+	ssl_socket = OpenSSL::SSL::SSLServer.new(socket, ssl_context)
+
+
+	loop do
+	  connection = ssl_socket.accept
+	  Thread.new {
+	    begin
+	      #do something
+	    rescue
+	      $stderr.puts $!
+	    end
+	  }
+	end
+	

data/doc/blob-sync.txt

@@ -5,78 +5,79 @@ Synchronizing images or binary objects between RhoConnect and the client is decl
 **NOTE: The example below shows how to synchronize an image created by the device's camera, but could be applied to any arbitrary files on the device.**
 
 ## Synchronizing from Device to RhoConnect
-Suppose you have a [Rhom model](/rhodes/rhom) called "Image" and you have a [camera callback function](/rhodes/device-caps#camera) defined in the Image model's controller:
-
-	:::ruby
-	def camera_callback
-	  if @params['status'] == 'ok'
-	    #create image record in the DB
-	    image = Image.new({'image_uri'=>@params['image_uri']})
-	    image.save
-	    SyncEngine.dosync
-	  end  
-	  #reply on the callback
-	  render :action => :ok, :layout => false
-	end
-	
+Suppose you have a [Rhom model](/rhodes/rhom) called "Image" and you have a [camera callback function](/rhodes/device-caps#camera) defined in the Rhodes Image model's controller:
+
+    :::ruby
+    def camera_callback
+      if @params['status'] == 'ok'
+        #create image record in the DB
+        image = Image.new({'image_uri'=>@params['image_uri']})
+        image.save
+        SyncEngine.dosync
+      end  
+      #reply on the callback
+      render :action => :ok, :layout => false
+    end
+  
 When this is executed in a Rhodes application:
 
 * This callback triggers a sync after saving saving an image.  
 
 * Then Rhodes will push the image file to the RhoConnect application by HTTP POST.
 
-* `application.rb#store_blob` is called for optional pre-processing of the file.  This is useful in cases where you want to preserve the filename that Rhodes sent.  
+* `image.rb#store_blob` is called for pre-processing of the file. 
+NOTE: You must implement this method inside of your Source Adapter Model and do not use the tempfile provided by Rack, because RhoConnect processing is asynchronous and there is no guarantee that the temporary file will exist at the actual time when `create` is called.  
 
-The following example stores the `:filename` argument as another object attribute.
+The following example stores the file permanently and keeps its `:filename` argument as another object attribute.
 
-	:::ruby
-	def store_blob(obj,field_name,blob)
-      obj['filename'] = blob[:filename]
-      super
+    :::ruby
+    def store_blob(obj,field_name,blob)
+      # ... custom code to store the blob file ...
+      my_stored_filename = do_custom_store[blob[:filename]]
+      obj['filename'] = my_stored_filename
     end
 
-* The RhoConnect source adapter tied to this Rhom model processes the blob in the `create` method.
+* The RhoConnect source adapter model tied to this Rhom model processes the blob in the `create` method.
 
 The following example takes the blob and stores it in S3:
 
-	:::ruby
-	def create(create_hash)
-	  # this would be a blob attribute, points to a tempfile 
-	  # containing the raw post data
-	  name = create_hash["image_uri"] 
-	  
-	  # filename we saved in application.rb#store_blob method
-	  basename = create_hash["filename"]
-	  S3Object.store(
-	    basename,
-	    open(name),
-	    @bucket,
-	    :access => :public_read
-	  )
-	  basename #=> object id here is the filename
-	end
+    :::ruby
+    def create(create_hash)
+      # this would be a blob attribute, points to a tempfile
+      # containing the raw post data
+      name = create_hash["image_uri"]
+      # filename we saved in application.rb#store_blob method
+      basename = create_hash["filename"]
+      S3Object.store(
+        basename,
+        open(name),
+        @bucket,
+        :access => :public_read
+      )
+      basename #=> object id here is the filename
+    end
 
 In this example, we store the image blob to s3 so we can query it later.  See the "image" source adapter that comes with [the rhodes-samples-server](https://github.com/rhomobile/rhodes-samples-server/blob/master/sources/image.rb).
 
-## Query for Blobs in the Source Adapter
+## Query for Blobs in the Source Adapter Model
 
 In your query call, you should store the URL to images in the blob attribute so that the device can fetch the image when it synchronizes.
 
-	:::ruby
-	def query(params=nil)
-	  @result={}
-	  Bucket.find(@bucket).objects.each do |entry|
-	    new_item = {
-		  'image_uri-rhoblob' => @baseurl+@bucket+'/'+File.basename(entry.key)
-	    }
-	    @result[entry.key] = new_item
-	  end
-	  @result
-	end              
+    :::ruby
+    def query(params=nil)
+      @result={}
+      Bucket.find(@bucket).objects.each do |entry|
+        new_item = {
+        'image_uri-rhoblob' => @baseurl+@bucket+'/'+File.basename(entry.key)
+        }
+        @result[entry.key] = new_item
+      end
+      @result
+    end
 
 Here we save the image URL to an attribute `image_uri-rhoblob`.  This will correspond to the `image_uri` attribute in our Rhom model above.
 
-**NOTE: In order for Rhodes to automatically recognize a blob attribute, the attribute name must end with "-rhoblob".  In the above example, `image_uri` was our Rhom attribute, so our source adapter assigned `image_uri-rhoblob` with the blob URL.**
+**NOTE: In order for Rhodes to automatically recognize a blob attribute, the attribute name must end with "-rhoblob".  In the above example, `image_uri` was our Rhom attribute, so our source adapter model assigned `image_uri-rhoblob` with the blob URL.**
 
 ### Blob file name and extension on client
 File name is generated on client when downloading. File extension is determine by:
@@ -85,53 +86,59 @@ File name is generated on client when downloading. File extension is determine b
 * If no extension parameter the blob URL then extension is extracted from blob URL itself(looking for '.' from the end of the URL)
 * If still no file extension found, then '.bin' is used
 
-A complete image source adapter that stores files in S3 might look like:
-
-	:::ruby
-	require 'aws/s3'
-	class Image < SourceAdapter
-	  include AWS::S3
-
-
-	  def initialize(source,credential)
-	    AWS::S3::Base.establish_connection!(
-	      :access_key_id      => ENV['AMAZON_ACCESS_KEY_ID'],
-	      :secret_access_key  => ENV['AMAZON_SECRET_ACCESS_KEY']
-	    )
-	    @baseurl = 'http://s3.amazonaws.com/'
-	    @bucket = 'rhodes-samples-images'
-	    super(source,credential)
-	  end
-
-	  def query(params=nil)
-	    @result={}
-	    Bucket.find(@bucket).objects.each do |entry|
-	      new_item = {
-		    'image_uri-rhoblob' => @baseurl+@bucket+'/'+File.basename(entry.key)
-	      }
-	      @result[entry.key] = new_item
-	    end
-	    @result
-	  end
-
-	  def create(create_hash)
-	    puts "Creating: #{create_hash.inspect}"
-	    name = create_hash["image_uri"]
-	    basename = create_hash["filename"]
-	    S3Object.store(
-	      basename,
-	      open(name),
-	      @bucket,
-	      :access => :public_read
-	    )
-	    basename
-	  end
-
-	  def delete(delete_hash)
-	    puts "Removing: #{delete_hash.inspect}"
-	    S3Object.delete delete_hash['id'], @bucket
-	  end
-	end
+A complete image source adapter model that stores files in S3 might look like:
+
+    :::ruby
+    require 'aws/s3'
+    class Image < Rhoconnect::Model::Base
+      include AWS::S3
+
+
+      def initialize(source,credential)
+        AWS::S3::Base.establish_connection!(
+          :access_key_id      => ENV['AMAZON_ACCESS_KEY_ID'],
+          :secret_access_key  => ENV['AMAZON_SECRET_ACCESS_KEY']
+        )
+        @baseurl = 'http://s3.amazonaws.com/'
+        @bucket = 'rhodes-samples-images'
+        super(source,credential)
+      end
+
+      def query(params=nil)
+        @result={}
+        Bucket.find(@bucket).objects.each do |entry|
+          new_item = {
+          'image_uri-rhoblob' => @baseurl+@bucket+'/'+File.basename(entry.key)
+          }
+          @result[entry.key] = new_item
+        end
+        @result
+      end
+
+      def create(create_hash)
+        puts "Creating: #{create_hash.inspect}"
+        name = create_hash["image_uri"]
+        basename = create_hash["filename"]
+        S3Object.store(
+          basename,
+          open(name),
+          @bucket,
+          :access => :public_read
+        )
+        basename
+      end
+
+      def delete(delete_hash)
+        puts "Removing: #{delete_hash.inspect}"
+        S3Object.delete delete_hash['id'], @bucket
+      end
+
+      def store_blob(obj,field_name,blob)
+        # ... custom code to store the blob file ... 
+        my_stored_filename = do_custom_store[blob[:filename]]
+        obj['filename'] = my_stored_filename
+      end
+    end
 
 ## Rhodes Sample Code
 See controller and view in the [app/Blob directory](https://github.com/rhomobile/rhodes-system-api-samples/tree/master/app/Blob) of the [System API Samples application](http://github.com/rhomobile/rhodes-system-api-samples/tree/master) for a complete Rhodes code sample.

data/doc/bulk-sync.txt

@@ -8,7 +8,7 @@ If and when the Rhodes application issues a request to get bulk data, the RhoCon
 
 * Queue a [resque background job](http://github.com/defunkt/resque) which will run the bulk sync process.
 
-* Execute the ['login,'query','logoff' methods](/rhoconnect/source-adapters#source-adapter-api) of all source adapters matching the [requested data partition](/rhoconnect/source-adapters#data-partitioning) to get latest set of objects from the backend service
+* Execute the ['login,'query','logoff' methods](/rhoconnect/source-adapters#source-adapter-api) of all source adapter models matching the [requested data partition](/rhoconnect/source-adapters#data-partitioning) to get latest set of objects from the backend service
 
 * Generate appropriate database files for the device - hsqldb for Blackberry and sqlite for the rest of them. RhoConnect will generate sqlite files for iOS, Android, and Windows Mobile clients and hsqldb files for Blackberry (if enabled).
  

data/doc/client-java.txt

@@ -2,7 +2,7 @@
 
 ## Getting started
 
-* The RhoConnect Client is part of the Rhodes repository. You can get it [on github](https://github.com/rhomobile/rhodes/downloads) (select the latest 'rhoconnect-client' package). 
+* The RhoConnect Client is part of the Rhoconnect-client repository. You can get it [on github](https://github.com/rhomobile/rhodes/downloads) (select the latest 'rhoconnect-client' package). 
 
 * The RhoConnect Client for Android contains two files:
 
@@ -10,14 +10,14 @@
 
 ** librhoconnectclient.so - native part of RhoConnect Client library
 
-These can be build from <rhodes>/rhoconnect-client directory with next command
+These can be build from <rhoconnect-client>/rhoconnect-client directory with next command
 
     :::shell
     $>rake android:default
 
 * Create new Android project or open existing one in Eclipse. Add rhoimple.jar to your project build path and copy librhoconnectclient.so to <project_root>/libs/armeabi, so both Java and native parts of RhoConnect Client library will link with your project.
 
-* Copy all files and subfolders from <rhodes>/rhoconnect-client/Java/RhoConnect/assets to assets folder of your Android project.
+* Copy all files and subfolders from <rhoconnect-client>/rhoconnect-client/Java/RhoConnect/assets to assets folder of your Android project.
 
 ## RhoConnectClient initialization
 

data/doc/client-objc.txt

@@ -7,7 +7,7 @@ Source Code
 -----------
 The source code for the RhoConnect client store example is located here.
 
- * [rhoconnect-client\Samples\ObjectiveC\store](http://github.com/rhomobile/rhodes/tree/master/rhoconnect-client/Samples/ObjectiveC/store/)
+ * [rhoconnect-client\Samples\ObjectiveC\store](http://github.com/rhomobile/rhoconnect-client/tree/master/rhoconnect-client/Samples/ObjectiveC/store/)
 
 Pre-requisite Reading
 ---------------------
@@ -31,7 +31,7 @@ Pre-requisite Reading
 
 ## Setup
 
-The RhoConnect Client is part of the Rhodes repository; it contains files that you will need to add to your Xcode project. You can get the client [on github](https://github.com/rhomobile/rhodes/downloads). (Select the latest 'rhoconnect-client' package).
+The RhoConnect Client is part of the Rhoconnect-client repository; it contains files that you will need to add to your Xcode project. You can get the client [on github](https://github.com/rhomobile/rhodes/downloads). (Select the latest 'rhoconnect-client' package).
 
 Create a new Xcode project or open an existing one in Xcode.
 

data/doc/client.txt

@@ -6,7 +6,7 @@ Rhoconnect Client is a library to add sync data capability to your applications.
 ## Objective-C Client
 
 ### Getting started
-* The RhoConnect Client is part of the Rhodes repository. You can get it [on github](https://github.com/rhomobile/rhodes/downloads) (select the latest 'rhoconnect-client' package). 
+* The RhoConnect Client is part of the Rhoconnect-client repository. You can get it [on github](https://github.com/rhomobile/rhodes/downloads) (select the latest 'rhoconnect-client' package). 
 
 * Create new project or open existing one in XCode. Add `<rhoconnect-client>/objectivec/RhoConnectClient.xcodeproj` as dependency to your project, so the RhoConnectClient library will link with your project.
 
@@ -410,7 +410,7 @@ These can be build from <rhodes>/rhoconnect-client directory with next command
 
 * Create new Android project or open existing one in Eclipse. Add rhoimple.jar to your project build path and copy librhoconnectclient.so to <project_root>/libs/armeabi, so both Java and native parts of RhoConnect Client library will link with your project.
 
-* Copy all files and subfolders from <rhodes>/rhoconnect-client/Java/RhoConnect/assets to assets folder of your Android project.
+* Copy all files and subfolders from <rhoconnect-client>/rhoconnect-client/Java/RhoConnect/assets to assets folder of your Android project.
 
 ### RhoConnectClient initialization
 
@@ -610,8 +610,8 @@ Also several utility classes from com.rhomobile.rhodes package can be used. Thes
 
 ### Samples
 
-* See android_store sample [rhoconnect-client\Samples\Java\android_store](http://github.com/rhomobile/rhodes/tree/master/rhoconnect-client/Samples/Java/android_store/) as an example.
-* See android test Eclipse project [rhoconnect-client\Java\Android\test](http://github.com/rhomobile/rhodes/tree/master/rhoconnect-client/Java/Android/test/) as another example.
+* See android_store sample [rhoconnect-client\Samples\Java\android_store](http://github.com/rhomobile/rhoconnect-client/tree/master/rhoconnect-client/Samples/Java/android_store/) as an example.
+* See android test Eclipse project [rhoconnect-client\Java\Android\test](http://github.com/rhomobile/rhoconnect-client/tree/master/rhoconnect-client/Java/Android/test/) as another example.
 
 ## Packaging RhoConnect Client
 To package the RhoConnect Client archive for distribution, go to the top of the rhodes repository and run: