rhoconnect 5.1.1 → 5.5.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rhoconnect (5.1.1)
+    rhoconnect (5.5.0)
       bundler (~> 1.0)
       connection_pool (~> 1.2.0)
       json (~> 1.8)
@@ -17,8 +17,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.7)
-    arr-pm (0.0.9)
+    addressable (2.4.0)
+    archive-tar-minitar (0.5.2)
+    arr-pm (0.0.10)
       cabin (> 0)
     async-rack (0.5.1)
       rack (~> 1.1)
@@ -26,27 +27,22 @@ GEM
       builder
       mime-types
       xml-simple
-    backports (3.6.4)
+    backports (3.6.8)
     builder (3.2.2)
-    cabin (0.7.1)
-    childprocess (0.5.5)
+    cabin (0.9.0)
+    childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
-    clamp (0.6.4)
-    coffee-script (2.3.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.9.1)
+    clamp (1.0.0)
     connection_pool (1.2.0)
-    crack (0.4.2)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    daemons (1.2.1)
+    daemons (1.2.4)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    eventmachine (1.0.7)
+    eventmachine (1.0.9.1)
     excon (0.22.1)
-    execjs (2.4.0)
     ffaker (1.14.0)
-    ffi (1.9.7)
+    ffi (1.9.14)
     fog (1.11.1)
       builder
       excon (~> 0.20)
@@ -58,57 +54,52 @@ GEM
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.5)
-    fpm (1.3.3)
-      arr-pm (~> 0.0.9)
+    fpm (1.6.3)
+      archive-tar-minitar
+      arr-pm (~> 0.0.10)
       backports (>= 2.6.2)
       cabin (>= 0.6.0)
       childprocess
-      clamp (~> 0.6)
+      clamp (~> 1.0.0)
       ffi
-      json (>= 1.7.7)
-    hike (1.2.3)
-    jasmine (1.3.2)
-      jasmine-core (~> 1.3.1)
-      rack (~> 1.0)
-      rspec (>= 1.3.1)
-      selenium-webdriver (>= 0.1.3)
-    jasmine-core (1.3.1)
-    jasmine-headless-webkit (0.8.4)
-      coffee-script
-      jasmine-core (~> 1.1)
-      multi_json
-      rainbow
-      sprockets (~> 2)
-    json (1.8.2)
+      json (>= 1.7.7, < 2.0)
+      pleaserun (~> 0.0.24)
+      ruby-xz
+    insist (1.0.0)
+    io-like (0.3.0)
+    json (1.8.3)
     mime-types (1.25.1)
     mono_logger (1.1.0)
-    multi_json (1.11.0)
+    multi_json (1.12.1)
+    mustache (0.99.8)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
+    net-ssh (3.2.0)
     nokogiri (1.5.11)
-    rack (1.5.2)
+    pleaserun (0.0.24)
+      cabin (> 0)
+      clamp
+      insist
+      mustache (= 0.99.8)
+      stud
+    rack (1.5.5)
     rack-fiber_pool (0.9.3)
     rack-protection (1.5.3)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rainbow (2.0.0)
     rake (10.4.2)
-    rdoc (4.2.0)
-      json (~> 1.4)
-    redis (3.2.1)
-    redis-namespace (1.5.1)
+    redis (3.3.1)
+    redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
-    resque (1.25.2)
+    resque (1.26.0)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.3)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    rest-client (1.6.8)
+    rest-client (1.6.9)
       mime-types (~> 1.16)
-      rdoc (>= 2.4.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -118,42 +109,35 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
     ruby-hmac (0.4.0)
-    rubyzip (1.1.7)
+    ruby-xz (0.2.3)
+      ffi (~> 1.9)
+      io-like (~> 0.3)
+    rubyzip (1.2.0)
     safe_yaml (1.0.4)
-    selenium-webdriver (2.45.0)
-      childprocess (~> 0.5)
-      multi_json (~> 1.0)
-      rubyzip (~> 1.0)
-      websocket (~> 1.0)
-    simplecov (0.9.2)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.9.0)
-    simplecov-html (0.9.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
-    sinatra (1.4.5)
-      rack (~> 1.4)
+    sinatra (1.4.7)
+      rack (~> 1.5)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.10)
-    thin (1.6.3)
+      tilt (>= 1.3, < 3)
+    sqlite3 (1.3.11)
+    stud (0.0.22)
+    thin (1.7.0)
       daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0)
-      rack (~> 1.0)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (>= 1, < 3)
     thor (0.18.1)
-    tilt (1.4.1)
+    tilt (2.0.5)
     vegas (0.1.11)
       rack (>= 1.0.0)
     webmock (1.9.3)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    websocket (1.2.1)
     xml-simple (1.1.5)
 
 PLATFORMS
@@ -169,8 +153,6 @@ DEPENDENCIES
   ffaker (~> 1.14.0)
   fog (~> 1.11.1)
   fpm (>= 0.4.26)
-  jasmine
-  jasmine-headless-webkit
   jdbc-sqlite3 (>= 3.7.2)
   jruby-openssl (>= 0.7.4)
   puma (~> 1.6.3)
@@ -185,3 +167,6 @@ DEPENDENCIES
   warbler
   webmock (~> 1.9.0)
   win32-process
+
+BUNDLED WITH
+   1.13.1

data/LICENSE

@@ -1,75 +1,8 @@
-An online copy of the following license is available here: http://rhomobile.com/products/rhoconnect/license/
+The MIT License (MIT)
+Copyright (c) 2011-2016 Symbol Technologies LLC
 
-This RhoConnect Commercial License Agreement is a legal agreement between Rhomobile Inc. ("Rhomobile"), and Licensee (either an individual or a legal entity, hereafter referred to as "Licensee") for the Licensed Software (as defined below). The Licensed Software is not open source software and this is not an open source license.
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-1. DEFINITIONS
-Affiliate of a Party shall mean an entity (i) which is directly or indirectly controlling such Party; (ii) which is under the same direct or indirect ownership or control as such Party; or (iii) which is directly or indirectly owned or controlled by such Party.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-Licensee Application shall mean an application (a) developed using a license under Rhomobile's Rhodes framework and (b) which runs on a Mobile Device and synchronizes through the Licensed Software running on a server.
-
-Licensed Software shall mean the RhoConnect computer software, online or electronic documentation, associated media and printed materials, including the source code, example programs and the documentation delivered by Rhomobile to Licensee in conjunction with this Agreement.
-
-Support shall mean standard developer support that is provided by Rhomobile to assist eligible Designated Users in using the Licensed Software in accordance with its established standard support procedures.
-
-Updates shall mean a release or version of the Licensed Software containing enhancements, new features, bug fixes, error corrections and other changes that are generally made available to users of the Licensed Software that have contracted for maintenance and support.
-
-Device shall mean a specific physical mobile device that interacts with the Licensed Software
-
-2. OWNERSHIP
-The Licensed Software is protected by copyright laws and international copyright treaties, as well as other intellectual property laws and treaties. The Licensed Software is licensed, not sold.
-
-Rhomobile shall own all right, title and interest including the intellectual property rights in and to the information on bug fixes or error corrections relating to the Licensed Software that are submitted by Licensee to Rhomobile as well as any intellectual property rights to the correction of any errors, if any. To the extent any rights do not automatically vest in Rhomobile, Licensee assigns, and shall ensure that all of its Affiliates, agents, subcontractors and employees assign, all such rights to Rhomobile.
-
-3. VALIDITY OF THE AGREEMENT
-By installing, copying, or otherwise using the Licensed Software, Licensee agrees to be bound by the terms of this Agreement. If Licensee does not agree to the terms of this Agreement, Licensee may not install, copy, or otherwise use the Licensed Software. In addition, by installing, copying, or otherwise using any Updates or other components of the Licensed Software that Licensee receives separately as part of the Licensed Software, Licensee agrees to be bound by any additional license terms that accompany such Updates, if any. If Licensee does not agree to the additional license terms that accompany such Updates, Licensee may not install, copy, or otherwise use such Updates. Upon Licensee's acceptance of the terms and conditions of this Agreement and payment of the licensee fee, Rhomobile grants Licensee the right to use the Licensed Software in the manner provided below.
-
-4. LICENSE GRANT
-
-4.1 Grant
-Subject to the terms and conditions of this Agreement, Rhomobile grants to Licensee a non-exclusive, non-transferable, non-sublicensable license to install and use the Licensed Software as contemplated in the applicable documentation and the applicable invoice for the Licensed Software. Licensee is not granted any rights or licenses in the Licensed Software other than those rights expressly granted in this Agreement. Unless otherwise provided in an invoice from Rhomobile or Rhomobile authorized third party sublicensor, Licensee may only install and use the Licensed Software on a single computer ("Server"). If Licensee is explicitly granted a multiple Server license by Rhomobile, or Rhomobile authorized third party sublicensor in an invoice, Licensee may install and use the Licensed Software on not more than the number of Servers listed in the applicable invoice. All uses of the Licensed Software must be in accordance with the documentation provided for the Licensed Software. The Licensed Software is licensed only to Licensee and may not be transferred to any other person or entity without Rhomobile's prior written authorization. Any authorized transferee of the Licensed Software shall be bound in writing by the terms and conditions of this Agreement. In no event may Licensee transfer, assign, rent, lease, sell, or otherwise dispose of the Licensed Software on a temporary or permanent basis except as expressly provided herein. The license granted herein will automatically terminate in the event of any violation of this Agreement by Licensee.
-
-4.2 Capacity Restrictions
-The Licensed Software shall only be used to support the number of Devices and the number of Licensee Applications set forth in the applicable invoice and paid for. To replace a Device with a new Device for purposes of determining how many Devices are being supported at any one time, the replaced Device must be removed from the RhoConnect directory. Increases in the number of Devices and/or the number of Licensee Applications being supported by the Licenses Software must be purchased in advance.
-
-5 LIMITED WARRANTY AND WARRANTY DISCLAIMER
-Rhomobile warrants to Licensee for a period of ninety (90) days from the date of Licensee's receipt of the Licensed Software (the "Warranty Period") that the Licensed Software as delivered will conform substantially to Rhomobile's then-current published functional specifications set forth in the documentation for the Licensed Software when installed and operated as contemplated in such documentation. In the event of any nonconformity, Rhomobile (or its designee) may, in its sole discretion, either (i) remedy the nonconformity within a reasonable period after notice and verification thereof or (ii) refund the amount Licensee paid for the Software and terminate this Agreement and the license granted herein; provided, however, that Licensee must return the original and all copies of the Licensed Software to Rhomobile or its authorized representative before Licensee will be entitled to receive any such refund. THIS SECTION 5 STATES LICENSEE'S SOLE REMEDY FOR A BREACH OF THE LIMITED WARRANTY OF THE LICENSED SOFTWARE.
-
-EXCEPT AS SET FORTH IN SECTION 6, THE LICENSED SOFTWARE IS PROVIDED BY RHOMOBILE AND ITS LICENSORS "AS IS" WITHOUT ANY WARRANTY OF ANY KIND INCLUDING, WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. NEITHER RHOMOBILE NOR ITS LICENSORS WARRANT THAT THE LICENSED SOFTWARE IS ERROR-FREE OR THAT IT WILL OPERATE WITHOUT INTERRUPTION. NEITHER RHOMOBILE NOR ITS LICENSORS WARRANT, GUARANTEE OR MAKE ANY REPRESENTATION REGARDING THE USE, OR THE RESULTS OF THE USE OF THE LICENSED SOFTWARE INCLUDING, WITHOUT LIMITATION, THE CORRECTNESS, ACCURACY OR RELIABILITY OF SUCH USE OR RESULTS. LICENSEE ACKNOWLEDGES AND AGREES THAT RHOMOBILE IS NOT RESPONSIBLE FOR AND WILL HAVE NO LIABILITY FOR HARDWARE, SOFTWARE, CONTENT OR OTHER ITEMS OR ANY SERVICES PROVIDED BY ANY PERSONS OTHER THAN RHOMOBILE.
-
-6. LIMITATION OF LIABILITY
-TO THE MAXIMUM EXTENT PERMITTED BY LAW, RHOMOBILE AND ITS LICENSORS WILL NOT BE LIABLE WITH RESPECT TO ANY SUBJECT MATTER OF THIS AGREEMENT UNDER ANY CONTRACT, NEGLIGENCE, STRICT LIABILITY OR OTHER LEGAL OR EQUITABLE THEORY FOR: (I) ANY AMOUNTS IN EXCESS IN THE AGGREGATE OF THE AMOUNTS YOU PAID FOR THE LICENSED SOFTWARE; (II) ANY LOST DATA OR OTHER EXEMPLARY, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, LOSS OF DATA, OR ANY AND ALL LOST PROFITS, EVEN IF RHOMOBILE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES; OR (III) THE COST OF PROCURING SUBSTITUTE GOODS, SERVICES OR TECHNOLOGY. THE LIMITATION OF LIABILITY SET FORTH IN THIS SECTION 6 SHALL NOT APPLY TO THE EXTENT PROHIBITED BY APPLICABLE LAW.
-
-7. SUPPORT AND UPDATES
-Licensee shall be eligible to receive Support and Updates for one year from the date of the delivery of the Licensed Software to Licensee, in accordance with Rhomobile's then current policies and procedures, if any. After that time period the customer shall be entitled to execute a maintenance agreement which will entitle them to ongoing support and updates. Licensee may purchase additional Support and Updates following the Initial Term at 18% of the original price of the Licensed Software.
-
-8. EXPORT
-
-Licensee acknowledges that the Licensed Software may be subject to the export and import control laws of the United States and any country where the Licensed Software is manufactured or received. Licensee agrees not to violate any such laws. Licensee further agrees not to export the Licensed Software to any prohibited country, entity or person for which an export license or other governmental approval is required. Obtaining any necessary governmental approval or licenses is solely the obligation of Licensee.
-
-9. GENERAL PROVISIONS
-
-9.1 Marketing
-Rhomobile may include Licensee's company name and logo in a publicly available list of Rhomobile Licensees and in its public communications.
-
-9.2 No Assignment
-Licensee shall not be entitled to assign or transfer all or any of its rights, benefits and obligations under this Agreement without the prior written consent of Rhomobile, which shall not be unreasonably withheld.
-
-9.3 Termination
-This Agreement will remain in force until terminated. Licensee may terminate this Agreement at any time upon providing written notice thirty days in advance of the termination. Rhomobile may terminate this Agreement if Licensee breaches any of the terms or conditions hereunder. Licensee agrees to destroy or return to Rhomobile the original and all copies of the Licensed Software immediately upon any termination of this Agreement, and certify the same in writing if requested.
-
-9.4 Surviving Sections
-Any terms and conditions that by their nature or otherwise reasonably should survive a cancellation or termination of this Agreement shall also be deemed to survive. Such terms and conditions include, but are not limited to the following Sections: 2, 4, 5, 6, 7, 8, 9, 11, and 12of this Agreement. Notwithstanding the foregoing, Section 4.1 shall not survive if the Agreement is terminated for material breach.
-
-9.5 Entire Agreement
-This Agreement constitutes the complete agreement between the parties and supersedes all prior or contemporaneous discussions, representations, and proposals, written or oral, with respect to the subject matters discussed herein No modification of this Agreement shall be effective unless contained in a writing executed by an authorized representative of each party. No term or condition contained in Licensee's purchase order shall apply unless expressly accepted by Rhomobile in writing. If any provision of the Agreement is found void or unenforceable, the remainder shall remain valid and enforceable according to its terms. If any remedy provided is determined to have failed for its essential purpose, all limitations of liability and exclusions of damages set forth in this Agreement shall remain in effect.
-
-9.6 Notices
-Any notice given by one party to the other shall be deemed properly given and deemed received if specifically acknowledged by the receiving party in writing or when successfully delivered to the recipient by hand, fax, or special courier during normal business hours on a business day to the addresses specified below. Each communication and document made or delivered by one party to the other party pursuant to this Agreement shall be in the English language or accompanied by a translation thereof.
-Notices to Rhomobile shall be given to:
-
-Rhomobile, Inc.
-3031 Tisch Way Suite 1002
-San Jose, CA 95128
-
-9.7 Governing Law and Legal Venue
-This Agreement shall be governed by and construed in accordance with the federal laws of the United States of America and the internal laws of the State of California without giving effect to any choice of law rule that would result in the application of the laws of any other jurisdiction. The United Nations Convention on Contracts for the International Sale of Goods (CISG) shall not apply. Each Party (a) hereby irrevocably submits itself to and consents to the jurisdiction of the United States District Court for the Northern District of California (or if such court lacks jurisdiction, the state courts of the State of California) for the purposes of any action, claim, suit or proceeding between the Parties in connection with any controversy, claim, or dispute arising out of or relating to this Agreement; and (b) hereby waives, and agrees not to assert by way of motion, as a defense or otherwise, in any such action, claim, suit or proceeding, any claim that is not personally subject to the jurisdiction of such court(s), that the action, claim, suit or proceeding is brought in an inconvenient forum or that the venue of the action, claim, suit or proceeding is improper.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/bench/benchapp/settings/settings.yml

@@ -8,15 +8,12 @@
 
 :test:
   :syncserver: http://localhost:9292/application/
-  :licensefile: settings/license.key
   :redis: localhost:6379
   :log_disabled: true
 :development:
   :syncserver: http://localhost:9292/application/
-  :licensefile: settings/license.key
   :redis: localhost:6379
   :log_disabled: true
 :production: 
   :syncserver: http://localhost:9292/application/
-  :licensefile: settings/license.key
   :redis: localhost:6379

data/bench/blobapp/settings/settings.yml

@@ -6,13 +6,10 @@
 :test: 
   :redis: localhost:6379
   :syncserver: http://localhost:9292/application/
-  :licensefile: settings/license.key
 :development: 
   :redis: localhost:6379
   :syncserver: http://localhost:9292/application/
-  :licensefile: settings/license.key
   :log_disabled: true
 :production: 
   :redis: localhost:6379
   :syncserver: http://localhost:9292/application/
-  :licensefile: settings/license.key

data/bench/lib/bench.rb

@@ -55,14 +55,6 @@ module Bench
       end
     end
 
-    def get_server_license_info
-      token = get_token
-      @body = RestClient.get(
-        "#{@host}/rc/#{Rhoconnect::API_VERSION}/system/license",
-        {'X-RhoConnect-API-TOKEN' => token, :content_type => :json})
-      JSON.parse(@body.to_s)
-    end
-
     def get_server_state(doc)
       token = get_token
       @body = RestClient.get(

data/bin/rhoconnect-benchmark

@@ -156,28 +156,6 @@ begin
     exit 10
   end
   
-  # get license info from the server
-  rc_license_info = Bench.get_server_license_info
-    
-  if options[:num_clients] == 0
-    n_clients = rc_license_info['seats'].to_i / options[:num_iterations]
-    if n_clients > 20
-      n_clients = 20
-    end
-    options[:num_clients] = n_clients
-  end
-  # calculate appropriate numbers for concurrency  
-  total_num_clients = options[:num_iterations].to_i*options[:num_clients].to_i
-  if total_num_clients > rc_license_info['seats']
-    puts ""
-    puts " In order to run benchmark tests with #{options[:num_clients]} concurrent clients"
-    puts " for #{options[:num_iterations]} iterations you need to have a license with at least #{total_num_clients} seats."
-    puts " Your application have only #{rc_license_info['seats']} seats available."
-    puts " Adjust the number of concurrent clients or number of iterations to fit within the available license."
-    puts ""
-    exit 10
-  end
-  
   # run test in a loop from 1 to max_clients concurrency
   concurrency_array = []
   if options[:max_clients].to_i > 1

data/commands/rhoconnect/restart.rb

@@ -5,7 +5,6 @@ Execute.define_task do
   method_option :push_server, :aliases => "-P", :type => :string, :desc => "Push server settings (default: #{PUSH_SERVER_URL})"
   method_option :api_token, :aliases => "-t", :type => :string, :desc => "API token  (default: #{API_TOKEN})"
   method_option :config, :aliases => "-f", :type => :string, :desc => "/path/to/rhoconnect/settings.yml file"  
-  method_option :licenseflie, :aliases => "-l", :type => :string, :desc => "/path/to/license.key file"
   def restart
     puts "Stop rhoconnect server ..."
     stop

data/commands/rhoconnect/start.rb

@@ -5,7 +5,6 @@ Execute.define_task do
   method_option :push_server, :aliases => "-P", :type => :string, :desc => "Push server settings (default: #{PUSH_SERVER_URL})"
   method_option :api_token, :aliases => "-t", :type => :string, :desc => "API token  (default: #{API_TOKEN})"
   method_option :config, :aliases => "-f", :type => :string, :desc => "/path/to/rhoconnect/settings.yml file"
-  method_option :licenseflie, :aliases => "-l", :type => :string, :desc => "/path/to/license.key file"
   def start(params = {})
     # if this command called from 'restart', then params not emply
     params = options if params.empty?
@@ -16,13 +15,7 @@ Execute.define_task do
         exit(-1)
       end
     end
-    if options[:licenseflie]  # -l license.key
-      unless File.exist?(params[:licenseflie])
-        puts "#{options[:licenseflie]}: No such file"
-        exit(-1)
-      end
-      licensefile = File.expand_path(options[:licenseflie])
-    end
+
     settings = config(options[:config])
 
     port = (params[:port]) ? params[:port] : URI.parse(settings[:syncserver]).port
@@ -43,7 +36,6 @@ Execute.define_task do
         token = (params[:api_token]) ? params[:api_token] : API_TOKEN
         options = { :syncserver => "http://localhost:#{port}", :redis => redis_url,
             :push_server => push_server, :api_token => token }
-        options[:licensefile] = licensefile if licensefile
         begin
           require 'securerandom'
           options[:secret] = SecureRandom.hex(64)
@@ -60,7 +52,7 @@ Execute.define_task do
     command = "bundle exec rackup -s #{defined?(JRUBY_VERSION) ? 'puma' : 'thin'}"
     rackup_config = settings[:rackup]
     command.sub!(/bundle exec /, '') if(rackup_config != "config.ru")
-    # Set environment varialbes: 'API_TOKEN', 'REDIS_URL', 'RHOCONNECT_LICENSE'
+    # Set environment varialbes: 'API_TOKEN', 'REDIS_URL'
     env = {}
     if params[:api_token]
       env["API_TOKEN"] = params[:api_token]
@@ -68,10 +60,6 @@ Execute.define_task do
     if params[:redis]
       env["REDIS_URL"] = params[:redis]
     end
-    if licensefile
-      license = IO.read(licensefile).strip
-      env["RHOCONNECT_LICENSE"] = license
-    end
 
     if jruby?
       puts 'Starting rhoconnect in jruby environment...'

data/doc/adapters-crm.txt

@@ -226,6 +226,6 @@ Type the following command in the CRM application's root directory:
 	
 
 ## Meta
-Created and maintained by Rhomobile Inc.
+Created and maintained by Symbol Technologies, Inc.
 
 Released under the [MIT License](http://www.opensource.org/licenses/mit-license.php).

data/doc/benchmarks-running.txt

@@ -32,7 +32,7 @@ To execute the Rhoconnect Benchmark test, use the `rhoconnect-benchmark` command
 	<tr>
 		<td width="20">-C</td>
 		<td width="200"><code>--nclients NUMBER</code></td>
-		<td>Specifies how many concurrent clients to emulate during the test. If this option is omitted, then the number of simulated clients will be determined based on the number of available seats in your Rhoconnect application's license.</td>
+		<td>Specifies how many concurrent clients to emulate during the test.</td>
 	</tr>
 	<tr>
 		<td width="20">-R</td>

data/doc/benchmarks.txt

@@ -157,7 +157,6 @@ Before running bench scripts you need configure bench application settings prope
 Edit rhoconnect/bench/benchapp/settings/settings.yml and set redis and syncserver properties:
 <pre>
 :development:
-  :licensefile: settings/license.key
   :redis: server_ip_address:6379
   :syncserver: http://server_dns_public_name:80/api/application/
 </pre>

data/doc/bulk-sync.txt

@@ -60,7 +60,6 @@ By default, bulk sync data files will be stored in the application's root folder
 	:::yaml
 	:development: 
   	  :redis: localhost:6379
-  	  :licensefile: settings/license.key
       :syncserver: http://localhost:9292/application/
       :bulk_sync_poll_interval: 3600
 

data/doc/command-line.txt

@@ -34,7 +34,6 @@ For example:
 	Generating with app generator:
 			 [ADDED]  storeserver/config.ru
 			 [ADDED]  storeserver/settings/settings.yml
-			 [ADDED]  storeserver/settings/license.key
 			 [ADDED]  storeserver/application.rb
 			 [ADDED]  storeserver/Rakefile
 			 [ADDED]  storeserver/Gemfile
@@ -45,7 +44,6 @@ Here's a basic rundown of each of the files that were just generated:
 
 * **config.ru** - This is a rackup file which will load your application.  RhoConnect uses the excellent [sinatra](http://www.sinatrarb.com/) web framework to run the application.
 * **settings/settings.yml** - This contains settings such as your redis connection, which source adapters exist and their parameters.  You can also put custom settings here.
-* **settings/license.key** - The RhoConnect [license](/rhoconnect/licensing) associated with your application.  The default license allows up to 10 devices to synchronize with the application.
 * **application.rb** - The RhoConnect application class where you can implement authentication.  You can also add other custom methods here to use in your application.  This class is a singleton, so all methods should be added to the `class << self` block.
 * **Rakefile** - This contains tasks that can be run from the terminal.
 * **Gemfile** - This file specifies application's dependencies using [bundler](http://gembundler.com/).
@@ -102,7 +100,6 @@ rhoconnect, type `rhoconnect` or `rhoconnect help`.
 	-P, [--push-server=PUSH_SERVER]  # Push server settings (default: http://someappname@localhost:8675/)
 	-t, [--api-token=API_TOKEN]      # API token  (default: my-rhoconnect-token)
 	-f, [--config=CONFIG]            # /path/to/rhoconnect/settings.yml file
-	-l, [--licenseflie=LICENSEFLIE]  # /path/to/license.key file
 
 ### Installing DTach (Mac OS / Linux only)
 
@@ -131,7 +128,6 @@ with an array of redis servers you are going to use:
 	:::yaml
 	# ...
 	:production:
-	  :licensefile: settings/license.key
 	  :syncserver: http://localhost:9292/api/application/
 	  :push_server: http://appname:secret@localhost:8675/
 	  # One or more redis servers
@@ -172,8 +168,6 @@ When you start RhoConnect in a directory that does not contain a rhoconnect sour
 
 Once .rhoconnect.yml has been created in your user home directory, you can manually modify it for the next time you start RhoConnect. For example, you could change the port upon which the syncserver runs.
 
-Running RhoConnect this way uses the default license key in the RhoConnect gem. You can use other license keys by using the `-l` option in the `rhoconnect start` command.
-
 #### Opening the Web Console
 
 If everything went well when you started RhoConnect, you should see the following in your console:

data/doc/java-plugin.txt

@@ -375,12 +375,6 @@ Reset the server: flush db and re-bootstrap server.
 	:::java
 	public static ClientResponse reset(String url, String token);
 
-#### `GET /rc/v1/system/license`
-Returns license information of the currently used license.
-
-	:::java
-	public static ClientResponse license(String url, String token);
-
 #### `GET /rc/v1/system/appserver`
 Returns the url of the plugin’s backend from the RhoConnect server.
 

data/doc/preparing-production.txt

@@ -73,10 +73,4 @@ This file contains all source adapter options and settings, such as the redis se
 
 	:production: 
 	  :redis: myredishost:6379
-	  :licensefile: settings/license.key
-	  :syncserver: http://localhost:9292/application/
-
-## settings/license.key
-This contains your RhoConnect license key text.  By default, a RhoConnect application comes with a 10 device license.  Please see the [licensing page](/rhoconnect/licensing) for more details.
-
-
+	  :syncserver: http://localhost:9292/application/

data/doc/public/cli.txt

@@ -34,7 +34,6 @@ For example:
 	Generating with app generator:
 			 [ADDED]  storeserver/config.ru
 			 [ADDED]  storeserver/settings/settings.yml
-			 [ADDED]  storeserver/settings/license.key
 			 [ADDED]  storeserver/application.rb
 			 [ADDED]  storeserver/Rakefile
 			 [ADDED]  storeserver/Gemfile
@@ -45,7 +44,6 @@ Here's a basic rundown of each of the files that were just generated:
 	
 * **config.ru** - This is a rackup file which will load your application.  RhoConnect uses the excellent [sinatra](http://www.sinatrarb.com/) web framework to run the application.
 * **settings/settings.yml** - This contains settings such as your redis connection, which source adapters exist and their parameters.  You can also put custom settings here.
-* **settings/license.key** - The RhoConnect [license](/rhoconnect/licensing) associated with your application.  The default license allows up to 10 devices to synchronize with the application.
 * **application.rb** - The RhoConnect application class where you can implement authentication.  You can also add other custom methods here to use in your application.  This class is a singleton, so all methods should be added to the `class << self` block.
 * **Rakefile** - This contains tasks that can be run from the terminal.
 * **Gemfile** - This file specifies application's dependencies using [bundler](http://gembundler.com/).