rhoconnect 5.1.1 → 5.5.0

data/lib/rhoconnect/web-console/views/home.js

@@ -9,7 +9,6 @@ App.Views.Home = Backbone.View.extend({
 	
     initialize: function() {
  	    var domain = $('input#domain').val();
-			this.model.get_license_info();
 	    this.model.set('partition_type','app')
 			this.model.fetch({
 				error: function(model,resp)
@@ -27,7 +26,6 @@ App.Views.Home = Backbone.View.extend({
 	    var session = new Session();
 		if(confirm("Are you sure you want to reset?")){
 			session.reset();
-			this.model.get_license_info();
 		}
 	},
 	
@@ -103,13 +101,13 @@ App.Views.Home = Backbone.View.extend({
 		out += "<tr><td><p style='margin-top:10px'>Sync Server</p></td>";
 		out += "<td><p style='margin-top:10px'><code style='margin:0'>"+domain+"</code></p></td>";
 		out += "<td><p style='margin-top:10px'>Paste this url into your client app configuration to sync with this RhoConnect instance.</p></td>"
-		out += "<form>"
+		out += "</tr>"
 		out += "<tr>"
 		out += "<td width='20%'><p style='margin-top:10px'>Change Admin Password</p></td>"
-		out += "<td width='40%'><p style='margin-top:10px'><input id='password2' type='password' name='password' value='' class='input-xlarge' placeholder='Enter new password' style='margin:0'/>"
-		out += "<input type='submit' class='btn btn-primary' value='Save' style='margin-left:10px'/><div class='edituser-status' style='display:inline;margin-left:10px;visibility:hidden'><span class=''></span></div></p></td>"
+		out += "<td width='40%'><form><p style='margin-top:10px'><input id='password2' type='password' name='password' value='' class='input-xlarge' placeholder='Enter new password' style='margin:0'/>"
+		out += "<input type='submit' class='btn btn-primary' value='Save' style='margin-left:10px'/><div class='edituser-status' style='display:inline;margin-left:10px;visibility:hidden'><span class=''></span></div></p></form></td>"
 		out += "<td width='40%'><p style='margin-top:10px'>By default the admin password is blank.</p></td>"
-		out += "</form>"
+		out += "</tr>"
 		out += "<tr>"
 		out += "<td width='20%'><p style='margin-top:10px'>API Token</p></td>"
 		out += "<td width='40%'><p id='api_token' style='margin-top:10px;display:none'><code>"+ session.getApiKey() +"</code></p>";

data/lib/rhoconnect.rb

@@ -5,7 +5,6 @@ require 'base64'
 require 'securerandom'
 require 'zip'
 require 'yaml'
-require 'rhoconnect/license'
 require 'rhoconnect/version'
 require 'rhoconnect/document'
 require 'rhoconnect/lock_ops'
@@ -53,7 +52,7 @@ module Rhoconnect
 
   class << self
     attr_accessor :base_directory, :app_directory, :data_directory, :vendor_directory, :redis,
-      :log_disabled, :license, :bulk_sync_poll_interval, :stats, :appserver, :api_token,
+      :log_disabled, :bulk_sync_poll_interval, :stats, :appserver, :api_token,
       :raise_on_expired_lock, :lock_duration, :cookie_expire, :predefined_sources,
       :connection_pool_size, :connection_pool_timeout, :redis_timeout, :store_key_ttl,
       :disable_resque_console, :disable_rc_console, :use_node, :restart_node_on_error, :redis_url,
@@ -119,7 +118,6 @@ module Rhoconnect
     Rhoconnect.data_directory ||= File.join(Rhoconnect.base_directory,'data')
     Rhoconnect.vendor_directory ||= File.join(Rhoconnect.base_directory,'vendor')
     Rhoconnect.stats ||= false
-    Rhoconnect.license = License.new
     Rhoconnect.disable_rc_console ||= false
     Rhoconnect.disable_resque_console ||= false
     Rhoconnect.use_node = Rhoconnect.use_node.nil? ? true : Rhoconnect.use_node

data/spec/apps/emptyapp/settings/settings.yml

@@ -1,14 +1,11 @@
 :sources: 
 
 :development:
-  :licensefile: settings/license.key
   :redis: localhost:6379
   :syncserver: http://localhost:9292/application/
 :test:
-  :licensefile: settings/license.key
   :redis: localhost:6379
   :syncserver: http://localhost:9292/application/
-:production: 
-  :licensefile: settings/license.key
+:production:
   :redis: localhost:6379
   :syncserver: http://localhost:9292/application/

data/spec/apps/jstestapp/settings/settings.yml

@@ -1,15 +1,12 @@
 :sources:
 :development:
-  :licensefile: settings/license.key
   :redis: localhost:6379
   :syncserver: http://localhost:9292/
 :test:
-  :licensefile: settings/license.key
   :redis: localhost:6379
   :syncserver: http://localhost:9292/
   # set :node_channel_timeout to 60 secs.
   :node_channel_timeout: 60
 :production:
-  :licensefile: settings/license.key
   :redis: localhost:6379
   :syncserver: http://localhost:9292/

data/spec/apps/rhotestapp/settings/settings.yml

@@ -18,12 +18,10 @@
   JsSample:
     :poll_interval: 100
 :development:
-  :licensefile: settings/license.key
   :bulk_sync_poll_interval: 3600
   :redis: localhost:6379
   :syncserver: http://localhost:9292/application/
 :test:
-  :licensefile: settings/license.key
   :iphonecertfile: settings/apple_fake_cert.pem
   :iphonepassphrase: certpassword
   :iphoneserver: gateway.sandbox.push.apple.com
@@ -36,7 +34,6 @@
   :cookie_expire: 9999999
   :poll_interval_default: 201
 :production:
-  :licensefile: settings/license.key
   :bulk_sync_poll_interval: 3600
   :redis: localhost:6379
   :syncserver: http://localhost:9292/application/

data/spec/client_spec.rb

@@ -35,20 +35,6 @@ describe "Client" do
     }.should raise_error(InvalidSourceNameError, 'Invalid Source Name For Client')
   end
 
-  it "should raise exception if license seats exceeded" do
-    Store.put_value(License::CLIENT_DOCKEY,100)
-    lambda { Client.create(@c_fields,{}) }.should raise_error(
-      LicenseSeatsExceededException, "WARNING: Maximum # of devices exceeded for this license."
-    )
-  end
-
-  it "should free seat when client is deleted" do
-    current = Store.get_value(License::CLIENT_DOCKEY).to_i
-    @c.delete
-    Store.get_value('client:count').should == '0'
-    Store.get_value(License::CLIENT_DOCKEY).to_i.should == current - 1
-  end
-
   it "should delete client and all associated documents" do
     @c.put_data(:cd, @data)
     docname = @c.docname(:cd)

data/spec/generator/generator_spec.rb

@@ -35,7 +35,6 @@ describe "Generator" do
               'config.ru',
               'public',
               'settings/settings.yml',
-              'settings/license.key',
               'spec/spec_helper.rb'
             ].each do |template|
               File.exist?("/tmp/#{appname}/#{template}").should be_true
@@ -60,8 +59,7 @@ describe "Generator" do
               'controllers/js/application_controller.js',
               'config.ru',
               'public',
-              'settings/settings.yml',
-              'settings/license.key'
+              'settings/settings.yml'
             ].each do |template|
               File.exist?("/tmp/#{appname}/#{template}").should be_true
             end