rhoconnect 5.1.1 → 5.5.0

data/doc/push-client-setup-android.txt

@@ -29,7 +29,6 @@ Update `settings/settings.yml` to include your GCM API key:
 	:development:
 	  :redis: localhost:6379
 	  :syncserver: http://localhost:9292/application/
-	  :licensefile: settings/license.key
 	  :gcm_api_key: your_gcm_api_key_here
 
 ## Enabling the Rhodes Android Client for Push

data/doc/push-client-setup-ios.txt

@@ -15,7 +15,6 @@ To set up your RhoConnect application for pushing to an iOS client, you will nee
 	  :iphoneserver: gateway.sandbox.push.apple.com
 	  :iphoneport: 2195
 	  :syncserver: http://localhost:9292/application/
-	  :licensefile: settings/license.key
 
 This is for running your application in development mode; for production, you will need all of the iphone settings, and you change the `:iphoneserver:` to:
 

data/doc/push-client-setup-rps.txt

@@ -27,7 +27,7 @@ The typical flow of a message using RPS:
 
 ### Download and Install Nodejs
 
-If you are using a Macintosh, go to the [Node.js website](http://nodejs.org/#), and download and install Node.js. (Motorola RhoMobile Suite for Windows includes Node.js in its installation.)
+If you are using a Macintosh, go to the [Node.js website](http://nodejs.org/#), and download and install Node.js. (RhoMobile Suite for Windows includes Node.js in its installation.)
 
 ### Starting the Push Service
 
@@ -139,9 +139,9 @@ The JSON file has the following parameters.
 
 To use the RhoConnect Push Service in your client application, you must install the rhoconnect-push-service runtime app(s) on your mobile device.
 
-On the Macintosh, the rhoconnect-push-service runtime apps for Android and for Windows Mobile are located in the Motorola RhoMobile Suite installation package, in a folder called rhoconnect-push-service.
+On the Macintosh, the rhoconnect-push-service runtime apps for Android and for Windows Mobile are located in the RhoMobile Suite installation package, in a folder called rhoconnect-push-service.
 
-On Windows, the rhoconnect-push-service runtime apps for Android and for Windows Mobile are located in the Motorola RhoMobile Suite installation, in a directory called rhoconnect-push-service.
+On Windows, the rhoconnect-push-service runtime apps for Android and for Windows Mobile are located in the RhoMobile Suite installation, in a directory called rhoconnect-push-service.
 
 ### Installing Runtime Apps on Android Device
 

data/doc/push-server-setup.txt

@@ -18,7 +18,6 @@ To set up your RhoConnect application for pushing to an iOS client, you will nee
 	  :iphoneserver: gateway.sandbox.push.apple.com
 	  :iphoneport: 2195
 	  :syncserver: http://localhost:9292/application/
-	  :licensefile: settings/license.key
 
 This is for running your application in development mode; for production, you will need all of the iphone settings, and you change the `:iphoneserver:` to:
 
@@ -39,7 +38,6 @@ Update `settings/settings.yml` to include your GCM API key:
 	:development:
 	  :redis: localhost:6379
 	  :syncserver: http://localhost:9292/application/
-	  :licensefile: settings/license.key
 	  :gcm_api_key: your_gcm_api_key_here
 
 ## Setting up RhoConnect Server Push for Android (C2DM)
@@ -52,7 +50,6 @@ To set up your RhoConnect application for Android C2DM push, you will need to up
 	:development:
 	  :redis: localhost:6379
 	  :syncserver: http://localhost:9292/application/
-	  :licensefile: settings/license.key
 	  :c2dm_username: username
 	  :c2dm_passwd: passwd
 	  :authtoken: authtoken
@@ -87,7 +84,7 @@ The typical flow of a message using RPS:
 
 ### Download and Install Nodejs
 
-If you are using a Macintosh, go to the [Node.js website](http://nodejs.org/#), and download and install Node.js. (Motorola RhoMobile Suite for Windows includes Node.js in its installation.)
+If you are using a Macintosh, go to the [Node.js website](http://nodejs.org/#), and download and install Node.js. (RhoMobile Suite for Windows includes Node.js in its installation.)
 
 ### Starting the Push Service
 

data/doc/rails-plugin.txt

@@ -138,11 +138,6 @@ Some of these values are not used for every API call such as resource_id and dat
 	data = {:login=>'username',:password=>'password'}
 	Rhoconnectrb::API::System.post_login(data)
 
-#### `GET /rc/v1/system/license`
-
-
-	Rhoconnectrb::API::System.get_license
-
 #### `POST /rc/v1/system/reset`
 
 

data/doc/rest-api.txt

@@ -27,10 +27,10 @@ All API calls will return http 200 and requested data (if applied). Otherwise, A
 	  end     
 	end  
 
-	handle_api_error("Can't get license information") do
+	handle_api_error("Can't get the url of the plugin's backend from the RhoConnect server") do
 	  @license_info = JSON.parse(
 		RestClient.get(
-		  "#{server}/rc/v1/system/license", 
+		  "#{server}/rc/v1/system/appserver", 
 	     {'X-RhoConnect-API-TOKEN' => @api_token}
 	    ).body
 	  )
@@ -52,18 +52,6 @@ Before you can use RhoConnect API you should login to the RhoConnect server and
 
 	@api_token = RestClient.post("#{server}/rc/v1/system/login", { :login => login, :password => password }.to_json, :content_type => :json)
 
-## System Resource - GET license
-
-	GET /rc/v1/system/license
-
-Returns license information of the currently used license
-
-	:::ruby
-	license_info = RestClient.get(
-	  "#{server}/rc/v1/system/license",
-      {'X-RhoConnect-API-TOKEN' => @api_token}
-    ).body
-
 ## System Resource - POST reset
 
 	POST /rc/v1/system/reset

data/doc/rhoconnect-redis-stack.txt

@@ -301,7 +301,6 @@ Edit your app `settings/settings.yml` file and replace :redis one liner by array
 	:::yaml
 	# ...
 	:production: 
-	  :licensefile: settings/license.key
 	  :syncserver: http://localhost:9292/api/application/
 	  :push_server: http://appname:secret@localhost:8675/
 	  # Two or more redis servers per app 

data/doc/settings.txt

@@ -12,14 +12,11 @@ Each of the environment categories must have the following entries:
 	:::yaml
 	:syncserver: <url>
 	:redis: <url|array_of_urls>
-	:licensefile: <filename>
 
 `:syncserver`: application's base url.
 
 `:redis`: Redis url. Can be specified as an Array of URLs. In that case, RhoConnect will use several Redis servers (this can be used in case of high-volume data)
 
-`:licensefile`: application's license file.
-
 In addition, you can specify the following settings:
 
 	:::yaml

data/doc/supported-platforms.txt

@@ -65,5 +65,4 @@ The components you should have for this environment are:
 
 ## Known issues for JRuby:
 
-* Usually JDK is shipped with only weak encryption, and that simply will not allow the proper key sizes being created by openssl. RhoConnect uses strong encryption for license keys and to function properly in JRuby environment installation of Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction policy files might be required.
 * Path to user’s gems, warbler data should not include white spaces (i.e. in user's account name).

data/doc/tutorial.txt

@@ -12,8 +12,6 @@ Full documentation of all capabilities of RhoConnect is in the [RhoConnect Devel
 
 * Install RhoConnect [from the command line](/rhoconnect/install) or by installing [RhoMobile Suite](/rhomobile-install).
 
-* If you have a RhoConnect license that has been sent to you, you can replace the settings/license.yml file as described [here](/rhoconnect/licensing).
-
 Now you are ready to write your RhoConnect app. You can generate an app with RhoStudio, or with the RhoConnect app command.
 
 ### Generating a RhoConnect App with RhoStudio

data/examples/simple/settings/settings.yml

@@ -9,16 +9,13 @@
    :poll_interval: 500
 
 :development:
-  :licensefile: settings/license.key
   :redis: localhost:6379
   :syncserver: http://localhost:9292/api/application/
   :push_server: http://appmike:appmikepwd@localhost:8675/
 :test:
-  :licensefile: settings/license.key
   :redis: localhost:6379
   :syncserver: http://localhost:9292/api/application/
-:production: 
-  :licensefile: settings/license.key
+:production:
   :redis: localhost:6379
   :syncserver: http://localhost:9292/api/application/
 

data/generators/rhoconnect.rb

@@ -22,7 +22,6 @@ module Rhoconnect
       copy_file 'rcgemfile', "#{name}/.rcgemfile"
       copy_file 'Rakefile', "#{name}/Rakefile"
       copy_file 'settings/settings.yml', "#{name}/settings/settings.yml"
-      copy_file 'settings/license.key', "#{name}/settings/license.key"
       empty_directory File.join("#{name}", 'public')
 
       if options[:js]

data/generators/templates/application/rcgemfile

@@ -2,6 +2,7 @@
 # DO NOT edit this file unless you know what are you doing!
 
 # v0.7.x removes Process.fork, need this version for now
+gem 'win32-api', '= 1.4.5'
 gem 'win32-process', '= 0.6.6', :platforms => [:mswin, :mingw]
 
 # use thin and eventmachine everywhere except JRuby

data/generators/templates/application/settings/settings.yml

@@ -1,19 +1,16 @@
 :sources:
 
 :development:
-  :licensefile: settings/license.key
   :redis: localhost:6379
   :syncserver: http://localhost:9292
   :push_server: http://someappname@localhost:8675/
   :api_token: my-rhoconnect-token
 :test:
-  :licensefile: settings/license.key
   :redis: localhost:6379
   :syncserver: http://localhost:9292
   :push_server: http://someappname@localhost:8675/
   :api_token: my-rhoconnect-token
 :production:
-  :licensefile: settings/license.key
   :redis: localhost:6379
   :syncserver: http://localhost:9292
   :push_server: http://someappname@localhost:8675/

data/installer/utils/package_upload/repos.rake

@@ -42,8 +42,8 @@ task "build:repos", :build_type, :build_number do |t, args|
     # Create configuration file "ditributions" in deb directory
     filename = "#{PKG_DIR}/deb/conf"
     cmd "sudo mkdir -p #{filename}"
-    distributions = "Origin: Rhomobile, Inc.\n" +
-                    "Label: Rhomobile, Inc.\n" +
+    distributions = "Origin: Symbol Technologies, Inc.\n" +
+                    "Label: Symbol Technologies, Inc.\n" +
                     "Codename: rhoconnect\n" +
                     "Architectures: i386 amd64\n" +
                     "Components: main\n" +

data/lib/rhoconnect/client.rb

@@ -43,7 +43,6 @@ module Rhoconnect
                 :delete_errors_page])
     
     def self.create(fields,params={})
-      Rhoconnect.license.check_and_use_seat
       fields[:id] ||= get_random_identifier
       res = super(fields,params)
       user = User.load(fields[:user_id])
@@ -81,7 +80,6 @@ module Rhoconnect
 
     def delete
       flush_all_documents
-      Rhoconnect.license.free_seat
       if Rhoconnect.stats
         Rhoconnect::Stats::Record.set('clients') { Store.decr('client:count') }
       else

data/lib/rhoconnect/controller/system_controller.rb

@@ -18,15 +18,6 @@ module Rhoconnect
         Rhoconnect.appserver = params['adapter_url'] || params[:attributes]['adapter_url']
       end
 
-      get "/license", \
-                 :deprecated_route => {:verb => :post, :url => ['/api/get_license_info', '/api/admin/get_license_info']} do
-        {:rhoconnect_version => Rhoconnect.license.rhoconnect_version,
-         :licensee => Rhoconnect.license.licensee,
-         :seats => Rhoconnect.license.seats,
-         :issued => Rhoconnect.license.issued,
-         :available => Rhoconnect.license.available }.to_json
-      end
-
       post "/login", :rc_handler => :admin_authenticate, :admin_required => false, :deprecated_route => {:verb => :post, :url => ['/login', '/api/admin/login']} do
         user = User.authenticate(params[:login], params[:password])
       end