lib/og.rb in og-0.27.0 vs lib/og.rb in og-0.28.0

@@ -1,17 +1,17 @@
 # = Og
 #
-# Copyright (c) 2004-2005, Navel Ltd (http://www.navel.gr)
 # Copyright (c) 2004-2005, George Moschovitis (http://www.gmosx.com)
+# Copyright (c) 2004-2005, Navel Ltd (http://www.navel.gr)
 #
 # Og (http://www.nitrohq.com) is copyrighted free software 
 # created and maintained by George Moschovitis (mailto:[e-mail]) 
 # and released under the standard BSD Licence. For details 
 # consult the file doc/LICENCE.
 
-require 'mega/synchash'
-require 'mega/syncarray'
+require 'facet/synchash'
+require 'facet/syncarray'
 
 require 'glue'
 require 'glue/logger'
 require 'glue/validation'
 require 'glue/aspects'
@@ -41,11 +41,11 @@
 
 module Og
 
   # The version.
 
-  Version = '0.27.0'
+  Version = '0.28.0'
 
   # Library path.
 
   LibPath = File.dirname(__FILE__)
 
@@ -93,10 +93,18 @@
 
   # Enable/dissable thread safe mode.
 
   setting :thread_safe, :default => true, :doc => 'Enable/dissable thread safe mode'
 
+  # Address of the Og cache (if distributed caching enabled).
+  
+  setting :cache_address, :default => '127.0.0.1', :doc => 'Address of the Og cache'
+  
+  # Port of the Og cache (if distributed caching enabled).
+  
+  setting :cache_port, :default => '9070', :doc => 'Port of the Og cache'
+  
   # The active manager
 
   mattr_accessor :manager
 
   # Pseudo type for binary data
@@ -117,11 +125,11 @@
 
         options[:called_by_og_setup] = true if options[:called_by_og_setup].nil?
         
         m = @@manager = Manager.new(options)        
         m.manage_classes
-        
+
         # Allows functionality that requires a store is 
         # finalized to be implemented. A vastly superior 
         # method of constructing foreign key constraints is an 
         # example of functionality this provides. Currently 
         # only used by the PostgreSQL store.
@@ -145,10 +153,9 @@
     # Helper method.
 
     def escape(str)
       @@manager.store.escape(str)
     end
-
   end
 
 end
 
 #--