[asl-commit] ActiveSambaLdap r43:

[null at cozmixng.org]

retro	2007-08-04 11:33:02 +0900 (Sat, 04 Aug 2007)

  New Revision: 43

  Removed files:
    trunk/lib/active_samba_ldap/unreloadable.rb
  Modified files:
    trunk/lib/active_samba_ldap/account.rb
    trunk/lib/active_samba_ldap/base.rb
    trunk/lib/active_samba_ldap/computer.rb
    trunk/lib/active_samba_ldap/dc.rb
    trunk/lib/active_samba_ldap/group.rb
    trunk/lib/active_samba_ldap/idmap.rb
    trunk/lib/active_samba_ldap/ou.rb
    trunk/lib/active_samba_ldap/unix_id_pool.rb
    trunk/lib/active_samba_ldap/user.rb

  Log:


  Modified: trunk/lib/active_samba_ldap/user.rb (+2 -0)
===================================================================
--- trunk/lib/active_samba_ldap/user.rb	2006-11-15 15:37:29 +09:00 (rev 42)
+++ trunk/lib/active_samba_ldap/user.rb	2007-08-04 11:33:02 +09:00 (rev 43)
@@ -2,6 +2,8 @@
 
 module ActiveSambaLdap
   class User < Base
+    include Reloadable::Subclasses
+
     include Account
 
     class << self

  Modified: trunk/lib/active_samba_ldap/dc.rb (+1 -1)
===================================================================
--- trunk/lib/active_samba_ldap/dc.rb	2006-11-15 15:37:29 +09:00 (rev 42)
+++ trunk/lib/active_samba_ldap/dc.rb	2007-08-04 11:33:02 +09:00 (rev 43)
@@ -1,6 +1,6 @@
 module ActiveSambaLdap
   class Dc < Base
-    extend Unreloadable
+    include Reloadable::Subclasses
 
     class << self
       def ldap_mapping(options={})

  Deleted: trunk/lib/active_samba_ldap/unreloadable.rb (+0 -7)
===================================================================
--- trunk/lib/active_samba_ldap/unreloadable.rb	2006-11-15 15:37:29 +09:00 (rev 42)
+++ trunk/lib/active_samba_ldap/unreloadable.rb	2007-08-04 11:33:02 +09:00 (rev 43)
@@ -1,7 +0,0 @@
-module ActiveSambaLdap
-  module Unreloadable
-    def reloadable?
-      false
-    end
-  end
-end

  Modified: trunk/lib/active_samba_ldap/unix_id_pool.rb (+1 -1)
===================================================================
--- trunk/lib/active_samba_ldap/unix_id_pool.rb	2006-11-15 15:37:29 +09:00 (rev 42)
+++ trunk/lib/active_samba_ldap/unix_id_pool.rb	2007-08-04 11:33:02 +09:00 (rev 43)
@@ -1,6 +1,6 @@
 module ActiveSambaLdap
   class UnixIdPool < Base
-    extend Unreloadable
+    include Reloadable::Subclasses
 
     class << self
       def ldap_mapping(options={})

  Modified: trunk/lib/active_samba_ldap/base.rb (+1 -1)
===================================================================
--- trunk/lib/active_samba_ldap/base.rb	2006-11-15 15:37:29 +09:00 (rev 42)
+++ trunk/lib/active_samba_ldap/base.rb	2007-08-04 11:33:02 +09:00 (rev 43)
@@ -102,7 +102,7 @@
   end
 
   class Base < ActiveLdap::Base
-    extend Unreloadable
+    include Reloadable::Subclasses
 
     class << self
       def restart_nscd

  Modified: trunk/lib/active_samba_ldap/account.rb (+0 -1)
===================================================================
--- trunk/lib/active_samba_ldap/account.rb	2006-11-15 15:37:29 +09:00 (rev 42)
+++ trunk/lib/active_samba_ldap/account.rb	2007-08-04 11:33:02 +09:00 (rev 43)
@@ -7,7 +7,6 @@
     def self.included(base)
       super
       base.extend(ClassMethods)
-      base.extend(Unreloadable)
     end
 
     # from source/include/rpc_misc.c in Samba

  Modified: trunk/lib/active_samba_ldap/ou.rb (+1 -1)
===================================================================
--- trunk/lib/active_samba_ldap/ou.rb	2006-11-15 15:37:29 +09:00 (rev 42)
+++ trunk/lib/active_samba_ldap/ou.rb	2007-08-04 11:33:02 +09:00 (rev 43)
@@ -1,6 +1,6 @@
 module ActiveSambaLdap
   class Ou < Base
-    extend Unreloadable
+    include Reloadable::Subclasses
 
     class << self
       def ldap_mapping(options={})

  Modified: trunk/lib/active_samba_ldap/idmap.rb (+1 -1)
===================================================================
--- trunk/lib/active_samba_ldap/idmap.rb	2006-11-15 15:37:29 +09:00 (rev 42)
+++ trunk/lib/active_samba_ldap/idmap.rb	2007-08-04 11:33:02 +09:00 (rev 43)
@@ -1,6 +1,6 @@
 module ActiveSambaLdap
   class Idmap < Base
-    extend Unreloadable
+    include Reloadable::Subclasses
 
     class << self
       def ldap_mapping(options={})

  Modified: trunk/lib/active_samba_ldap/computer.rb (+3 -0)
===================================================================
--- trunk/lib/active_samba_ldap/computer.rb	2006-11-15 15:37:29 +09:00 (rev 42)
+++ trunk/lib/active_samba_ldap/computer.rb	2007-08-04 11:33:02 +09:00 (rev 43)
@@ -2,7 +2,10 @@
 
 module ActiveSambaLdap
   class Computer < Base
+    include Reloadable::Subclasses
+
     include Account
+
     class << self
       def ldap_mapping(options={})
         default_options = {

  Modified: trunk/lib/active_samba_ldap/group.rb (+1 -1)
===================================================================
--- trunk/lib/active_samba_ldap/group.rb	2006-11-15 15:37:29 +09:00 (rev 42)
+++ trunk/lib/active_samba_ldap/group.rb	2007-08-04 11:33:02 +09:00 (rev 43)
@@ -2,7 +2,7 @@
 
 module ActiveSambaLdap
   class Group < Base
-    extend Unreloadable
+    include Reloadable::Subclasses
 
     # from librpc/ndr/security.h in Samba
     SID_BUILTIN = "S-1-5-32"