From null at cozmixng.org  Sat Sep  5 23:35:14 2009
From: null at cozmixng.org (null at cozmixng.org)
Date: Sun, 06 Sep 2009 12:35:14 +0900
Subject: [asl-commit] ActiveSambaLdap (trunk) r183: * add missing gem plugin
 support in 0.0.7 entry.
Message-ID: <20090906033514.479B11D1C80@mail.cozmixng.org>

retro	2009-09-06 12:35:13 +0900 (Sun, 06 Sep 2009)

  New Revision: 183

  Log:
    * add missing gem plugin support in 0.0.7 entry.
      Suggested by Kazuhiro NISHIYAMA. Thanks!!!
  Modified files:
    trunk/NEWS.en
    trunk/NEWS.ja


  Modified: trunk/NEWS.en (+1 -0)
===================================================================
--- trunk/NEWS.en	2009-08-06 00:52:18 -15:00 (rev 182)
+++ trunk/NEWS.en	2009-09-06 12:35:13 +09:00 (rev 183)
@@ -12,6 +12,7 @@
 == 0.0.7: 2009-07-18
 
 * Supported ActiveLdap 1.1.0.
+* Supported gem plugin.
 
 == 0.0.6: 2008-06-18
 

  Modified: trunk/NEWS.ja (+1 -0)
===================================================================
--- trunk/NEWS.ja	2009-08-06 00:52:18 -15:00 (rev 182)
+++ trunk/NEWS.ja	2009-09-06 12:35:13 +09:00 (rev 183)
@@ -12,6 +12,7 @@
 == 0.0.7: 2009-07-18
 
 * ActiveLdap 1.1.0???
+* gem????????
 
 == 0.0.6: 2008-06-18
 


From null at cozmixng.org  Sat Sep  5 23:50:24 2009
From: null at cozmixng.org (null at cozmixng.org)
Date: Sun, 06 Sep 2009 12:50:24 +0900
Subject: [asl-commit] ActiveSambaLdap (trunk) r184: * don't exit by
	Timeout::Error.
Message-ID: <20090906035025.1F7471D1CAF@mail.cozmixng.org>

retro	2009-09-06 12:50:24 +0900 (Sun, 06 Sep 2009)

  New Revision: 184

  Log:
    * don't exit by Timeout::Error.
  Modified files:
    trunk/test/run-test.rb


  Modified: trunk/test/run-test.rb (+4 -1)
===================================================================
--- trunk/test/run-test.rb	2009-09-06 12:23:47 +09:00 (rev 183)
+++ trunk/test/run-test.rb	2009-09-06 12:50:24 +09:00 (rev 184)
@@ -17,4 +17,7 @@
 
 ARGV.unshift("--priority")
 
-exit Test::Unit::AutoRunner.run(true)
+require 'timeout'
+Test::Unit::ErrorHandler::NOT_PASS_THROUGH_EXCEPTIONS << Timeout::Error
+
+exit Test::Unit::AutoRunner.run(true, File.join(top_dir, "test"))


From null at cozmixng.org  Sun Sep  6 00:05:12 2009
From: null at cozmixng.org (null at cozmixng.org)
Date: Sun, 06 Sep 2009 13:05:12 +0900
Subject: [asl-commit] ActiveSambaLdap (trunk) r185: * fix a typo.
Message-ID: <20090906040512.6C7D91D1C80@mail.cozmixng.org>

retro	2009-09-06 13:05:11 +0900 (Sun, 06 Sep 2009)

  New Revision: 185

  Log:
    * fix a typo.
  Modified files:
    trunk/lib/active_samba_ldap/samba_entry.rb


  Modified: trunk/lib/active_samba_ldap/samba_entry.rb (+1 -1)
===================================================================
--- trunk/lib/active_samba_ldap/samba_entry.rb	2009-09-06 12:50:18 +09:00 (rev 184)
+++ trunk/lib/active_samba_ldap/samba_entry.rb	2009-09-06 13:05:11 +09:00 (rev 185)
@@ -12,7 +12,7 @@
       add_class(*samba_object_classes)
     end
 
-    def samba_object_class
+    def samba_object_classes
       self.class.samba_object_classes
     end
 


From null at cozmixng.org  Wed Sep 23 19:55:51 2009
From: null at cozmixng.org (null at cozmixng.org)
Date: Thu, 24 Sep 2009 08:55:51 +0900
Subject: [asl-commit] ActiveSambaLdap (trunk) r186: * support ActiveLdap
	1.1.1.
Message-ID: <20090923235551.F1B771D1CC8@mail.cozmixng.org>

retro	2009-09-24 08:55:51 +0900 (Thu, 24 Sep 2009)

  New Revision: 186

  Log:
    * support ActiveLdap 1.1.1.
  Modified files:
    trunk/lib/active_samba_ldap.rb
    trunk/lib/active_samba_ldap/populate.rb
    trunk/test/command.rb
    trunk/test/test_asl_useradd.rb


  Modified: trunk/lib/active_samba_ldap.rb (+1 -1)
===================================================================
--- trunk/lib/active_samba_ldap.rb	2009-09-06 12:50:39 +09:00 (rev 185)
+++ trunk/lib/active_samba_ldap.rb	2009-09-24 08:55:51 -15:00 (rev 186)
@@ -8,7 +8,7 @@
   end
 end
 
-required_active_ldap_version = ">= 1.1.0"
+required_active_ldap_version = ">= 1.1.1"
 require_gem_if_need.call("active_ldap", "activeldap",
                          required_active_ldap_version)
 

  Modified: trunk/test/command.rb (+8 -3)
===================================================================
--- trunk/test/command.rb	2009-09-06 12:50:39 +09:00 (rev 185)
+++ trunk/test/command.rb	2009-09-24 08:55:51 -15:00 (rev 186)
@@ -59,9 +59,14 @@
     in_r.close unless in_r.closed?
     out_w.close unless out_w.closed?
     err_w.close unless err_w.closed?
-    Timeout.timeout(5) do
-      pid, status = Process.waitpid2(pid)
-      [status.exited? && status.exitstatus.zero?, out_r.read, err_r.read]
+    begin
+      Timeout.timeout(10) do
+        pid, status = Process.waitpid2(pid)
+        [status.exited? && status.exitstatus.zero?, out_r.read, err_r.read]
+      end
+    rescue Timeout::Error
+      Process.kill(:KILL, pid)
+      [false, out_r.read, err_r.read, "killed"]
     end
   end
 end

  Modified: trunk/lib/active_samba_ldap/populate.rb (+1 -0)
===================================================================
--- trunk/lib/active_samba_ldap/populate.rb	2009-09-06 12:50:39 +09:00 (rev 185)
+++ trunk/lib/active_samba_ldap/populate.rb	2009-09-24 08:55:51 -15:00 (rev 186)
@@ -95,6 +95,7 @@
         end
 
         def ensure_container_base(dn, target_name, klass, ignore_base=false)
+          dn = dn.to_s if dn.is_a?(ActiveLdap::DN)
           entries = []
           suffixes = []
           dn.split(/,/).reverse_each do |suffix|

  Modified: trunk/test/test_asl_useradd.rb (+2 -2)
===================================================================
--- trunk/test/test_asl_useradd.rb	2009-09-06 12:50:39 +09:00 (rev 185)
+++ trunk/test/test_asl_useradd.rb	2009-09-24 08:55:51 -15:00 (rev 186)
@@ -67,7 +67,7 @@
         assert(user_class.exists?(uid))
 
         user = user_class.find(uid)
-        assert_match(/\Auid=#{uid},ou=#{ou},/, user.dn)
+        assert_match(/\Auid=#{uid},ou=#{ou},/, user.dn.to_s)
       end
 
       assert(ou_class.exists?(ou))
@@ -91,7 +91,7 @@
         assert(computer_class.exists?(uid))
 
         computer = computer_class.find(uid)
-        assert_match(/\Auid=#{Regexp.escape(uid)},ou=#{ou},/, computer.dn)
+        assert_match(/\Auid=#{Regexp.escape(uid)},ou=#{ou},/, computer.dn.to_s)
       end
 
       assert(ou_class.exists?(ou))


From null at cozmixng.org  Wed Sep 23 19:55:54 2009
From: null at cozmixng.org (null at cozmixng.org)
Date: Thu, 24 Sep 2009 08:55:54 +0900
Subject: [asl-commit] ActiveSambaLdap (trunk) r187: * bump required
 ActiveLdap version: 1.1.1 -> 1.2.0.
Message-ID: <20090923235554.D168F1D1CC9@mail.cozmixng.org>

retro	2009-09-24 08:55:53 +0900 (Thu, 24 Sep 2009)

  New Revision: 187

  Log:
    * bump required ActiveLdap version: 1.1.1 -> 1.2.0.
  Modified files:
    trunk/lib/active_samba_ldap.rb


  Modified: trunk/lib/active_samba_ldap.rb (+1 -1)
===================================================================
--- trunk/lib/active_samba_ldap.rb	2009-09-21 22:14:08 +09:00 (rev 186)
+++ trunk/lib/active_samba_ldap.rb	2009-09-24 08:55:53 -15:00 (rev 187)
@@ -8,7 +8,7 @@
   end
 end
 
-required_active_ldap_version = ">= 1.1.1"
+required_active_ldap_version = ">= 1.2.0"
 require_gem_if_need.call("active_ldap", "activeldap",
                          required_active_ldap_version)
 


From null at cozmixng.org  Wed Sep 23 19:55:57 2009
From: null at cozmixng.org (null at cozmixng.org)
Date: Thu, 24 Sep 2009 08:55:57 +0900
Subject: [asl-commit] ActiveSambaLdap (trunk) r188: * add ActiveLdap 1.2.0
	support.
Message-ID: <20090923235557.D26271D1C83@mail.cozmixng.org>

retro	2009-09-24 08:55:56 +0900 (Thu, 24 Sep 2009)

  New Revision: 188

  Log:
    * add ActiveLdap 1.2.0 support.
  Modified files:
    trunk/NEWS.en
    trunk/NEWS.ja


  Modified: trunk/NEWS.en (+2 -1)
===================================================================
--- trunk/NEWS.en	2009-09-22 12:45:33 +09:00 (rev 187)
+++ trunk/NEWS.en	2009-09-24 08:55:56 -15:00 (rev 188)
@@ -2,12 +2,13 @@
 
 $Id$
 
-== 0.0.8: 20XX-XX-XX
+== 0.0.8: 2009-09-22
 
 * [#26692] scaffold_active_samba_ldap doesn't work with Rails 2.2.2.
   [Orlando Marquina]
 * [#26814] scaffold_active_samba_ldap generates wrong class name.
   [Orlando Marquina]
+* Supported ActiveLdap 1.2.0.
 
 == 0.0.7: 2009-07-18
 

  Modified: trunk/NEWS.ja (+2 -1)
===================================================================
--- trunk/NEWS.ja	2009-09-22 12:45:33 +09:00 (rev 187)
+++ trunk/NEWS.ja	2009-09-24 08:55:56 -15:00 (rev 188)
@@ -2,12 +2,13 @@
 
 $Id$
 
-== 0.0.8: 20XX-XX-XX
+== 0.0.8: 2009-09-22
 
 * [#26692] scaffold_active_samba_ldap?Rails 2.2.2??????????
   [Orlando Marquina]
 * [#26814] scaffold_active_samba_ldap?????????????????????
   [Orlando Marquina]
+* ActiveLdap 1.2.0???
 
 == 0.0.7: 2009-07-18
 


From null at cozmixng.org  Wed Sep 23 19:56:01 2009
From: null at cozmixng.org (null at cozmixng.org)
Date: Thu, 24 Sep 2009 08:56:01 +0900
Subject: [asl-commit] ActiveSambaLdap (trunk) r189: * use gettext/tools
	instead of gettext/utils.
Message-ID: <20090923235602.0E5751D1CC8@mail.cozmixng.org>

retro	2009-09-24 08:56:00 +0900 (Thu, 24 Sep 2009)

  New Revision: 189

  Log:
    * use gettext/tools instead of gettext/utils.
  Modified files:
    trunk/Rakefile


  Modified: trunk/Rakefile (+1 -1)
===================================================================
--- trunk/Rakefile	2009-09-22 14:06:43 +09:00 (rev 188)
+++ trunk/Rakefile	2009-09-24 08:56:00 -15:00 (rev 189)
@@ -134,7 +134,7 @@
 namespace :gettext do
   desc "Setup environment for GetText"
   task :environment do
-    require "gettext/utils"
+    require "gettext/tools"
   end
 
   namespace :po do


From null at cozmixng.org  Wed Sep 23 19:56:06 2009
From: null at cozmixng.org (null at cozmixng.org)
Date: Thu, 24 Sep 2009 08:56:06 +0900
Subject: [asl-commit] ActiveSambaLdap (trunk) r190: * follow the latest
	GetText changes.
Message-ID: <20090923235606.B50E51D1C83@mail.cozmixng.org>

retro	2009-09-24 08:56:05 +0900 (Thu, 24 Sep 2009)

  New Revision: 190

  Log:
    * follow the latest GetText changes.
  Modified files:
    trunk/Rakefile


  Modified: trunk/Rakefile (+1 -1)
===================================================================
--- trunk/Rakefile	2009-09-22 14:07:01 +09:00 (rev 189)
+++ trunk/Rakefile	2009-09-24 08:56:05 -15:00 (rev 190)
@@ -160,7 +160,7 @@
   namespace :mo do
     desc "Create *.mo from *.po (GetText)"
     task :create => "gettext:environment" do
-      GetText.create_mofiles(false)
+      GetText.create_mofiles
     end
   end
 end


From null at cozmixng.org  Wed Sep 23 19:56:10 2009
From: null at cozmixng.org (null at cozmixng.org)
Date: Thu, 24 Sep 2009 08:56:10 +0900
Subject: [asl-commit] ActiveSambaLdap (trunk) r191: * remove needless name=.
Message-ID: <20090923235610.4BEB71D1CC9@mail.cozmixng.org>

retro	2009-09-24 08:56:08 +0900 (Thu, 24 Sep 2009)

  New Revision: 191

  Log:
    * remove needless name=.
  Modified files:
    trunk/Rakefile


  Modified: trunk/Rakefile (+0 -1)
===================================================================
--- trunk/Rakefile	2009-09-22 14:08:05 +09:00 (rev 190)
+++ trunk/Rakefile	2009-09-24 08:56:08 -15:00 (rev 191)
@@ -55,7 +55,6 @@
 project = Hoe.spec("activesambaldap") do
   self.version = ActiveSambaLdap::VERSION
   self.rubyforge_name = "asl"
-  self.name = "ActiveSambaLdap"
   self.summary = "Samba+LDAP administration tools"
   self.extra_deps << ["activeldap", required_active_ldap_version]
   self.email = ["kou at clear-code.com"]


From null at cozmixng.org  Wed Sep 23 19:56:14 2009
From: null at cozmixng.org (null at cozmixng.org)
Date: Thu, 24 Sep 2009 08:56:14 +0900
Subject: [asl-commit] ActiveSambaLdap (trunk) r192: * bump required
 ActiveLdap version: 1.1.1 -> 1.2.0.
Message-ID: <20090923235615.240CA1D1CCE@mail.cozmixng.org>

retro	2009-09-24 08:56:13 +0900 (Thu, 24 Sep 2009)

  New Revision: 192

  Log:
    * bump required ActiveLdap version: 1.1.1 -> 1.2.0.
  Modified files:
    trunk/README.en
    trunk/README.ja


  Modified: trunk/README.en (+1 -1)
===================================================================
--- trunk/README.en	2009-09-22 14:17:01 +09:00 (rev 191)
+++ trunk/README.en	2009-09-24 08:56:13 -15:00 (rev 192)
@@ -25,7 +25,7 @@
 
 == Dependency libraries
 
-* ActiveLdap >= 1.1.0
+* ActiveLdap >= 1.2.0
 
 == Install
 

  Modified: trunk/README.ja (+1 -1)
===================================================================
--- trunk/README.ja	2009-09-22 14:17:01 +09:00 (rev 191)
+++ trunk/README.ja	2009-09-24 08:56:13 -15:00 (rev 192)
@@ -22,7 +22,7 @@
 
 == ???????
 
-* ActiveLdap >= 1.1.0
+* ActiveLdap >= 1.2.0
 
 == ??????
 


From null at cozmixng.org  Wed Sep 23 19:56:23 2009
From: null at cozmixng.org (null at cozmixng.org)
Date: Thu, 24 Sep 2009 08:56:23 +0900
Subject: [asl-commit] ActiveSambaLdap (trunk) r194: * need config.gem.
Message-ID: <20090923235623.DC7261D1CCB@mail.cozmixng.org>

retro	2009-09-24 08:56:22 +0900 (Thu, 24 Sep 2009)

  New Revision: 194

  Log:
    * need config.gem.
  Modified files:
    trunk/README.en
    trunk/README.ja


  Modified: trunk/README.en (+7 -1)
===================================================================
--- trunk/README.en	2009-09-22 14:24:55 +09:00 (rev 193)
+++ trunk/README.en	2009-09-24 08:56:22 -15:00 (rev 194)
@@ -45,8 +45,14 @@
 
 === Use with Rails
 
-Scaffold the environment of ActiveSambaLdap for Rails.
+First, load ActiveSambaLdap gem.
 
+Add the following line into config/environment.rb:
+
+  config.gem "activesambaldap", :lib => "active_samba_ldap"
+
+Next, scaffold the environment of ActiveSambaLdap for Rails.
+
   % script/generate scaffold_active_samba_ldap
 
 Modify config/ldap.yml generated by

  Modified: trunk/README.ja (+7 -1)
===================================================================
--- trunk/README.ja	2009-09-22 14:24:55 +09:00 (rev 193)
+++ trunk/README.ja	2009-09-24 08:56:22 -15:00 (rev 194)
@@ -42,8 +42,14 @@
 
 === Rails???
 
-Rails?ActiveSambaLdap?????????
+???ActiveSambaLdap?gem????????
 
+config/environment.rb?????????????
+
+  config.gem "activesambaldap", :lib => "active_samba_ldap"
+
+???Rails?ActiveSambaLdap?????????
+
   % script/generate scaffold_active_samba_ldap
 
 config/ldap.yml??????????????????????


From null at cozmixng.org  Wed Sep 23 19:56:28 2009
From: null at cozmixng.org (null at cozmixng.org)
Date: Thu, 24 Sep 2009 08:56:28 +0900
Subject: [asl-commit] ActiveSambaLdap (trunk) r195: * update message.
Message-ID: <20090923235628.7C2971D1CBF@mail.cozmixng.org>

retro	2009-09-24 08:56:27 +0900 (Thu, 24 Sep 2009)

  New Revision: 195

  Log:
    * update message.
  Modified files:
    trunk/Rakefile
    trunk/po/ja/active-samba-ldap.po


  Modified: trunk/Rakefile (+1 -1)
===================================================================
--- trunk/Rakefile	2009-09-22 14:27:04 +09:00 (rev 194)
+++ trunk/Rakefile	2009-09-24 08:56:27 -15:00 (rev 195)
@@ -152,7 +152,7 @@
       files += Dir.glob("bin/asl*")
       GetText.update_pofiles("active-samba-ldap",
                              files,
-                             "Ruby/ActiveSambaLdap #{ActiveSambaLdap::VERSION}")
+                             "ActiveSambaLdap #{ActiveSambaLdap::VERSION}")
     end
   end
 

  Modified: trunk/po/ja/active-samba-ldap.po (+15 -11)
===================================================================
--- trunk/po/ja/active-samba-ldap.po	2009-09-22 14:27:04 +09:00 (rev 194)
+++ trunk/po/ja/active-samba-ldap.po	2009-09-24 08:56:27 -15:00 (rev 195)
@@ -1,14 +1,14 @@
-# Japanese translations for Ruby/ActiveSambaLdap.
+# Japanese translations for ActiveSambaLdap.
 # Copyright (C) 2007-2009 Kouhei Sutou
-# This file is distributed under the same license as the Ruby/ActiveSambaLdap
+# This file is distributed under the same license as the ActiveSambaLdap
 # package.
 # Kouhei Sutou <kou at clear-code.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Ruby/ActiveSambaLdap 0.0.7\n"
-"POT-Creation-Date: 2007-09-16 22:47+0900\n"
-"PO-Revision-Date: 2009-07-11 09:41+0900\n"
+"Project-Id-Version: ActiveSambaLdap 0.0.8\n"
+"POT-Creation-Date: 2009-09-22 14:42+0900\n"
+"PO-Revision-Date: 2009-09-22 14:42+0900\n"
 "Last-Translator: Kouhei Sutou <kou at clear-code.com>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
@@ -36,7 +36,7 @@
 msgid "Show version"
 msgstr "????????"
 
-#: lib/active_samba_ldap/entry.rb:39
+#: lib/active_samba_ldap/entry.rb:59
 msgid "%s must be only ou"
 msgstr "%s?ou????????????"
 
@@ -95,15 +95,19 @@
 msgid "%s is not Samba available"
 msgstr "%s?Samba????????"
 
-#: lib/active_samba_ldap/configuration.rb:310
+#: lib/active_samba_ldap/base.rb:119
+msgid "%s is not UNIX available"
+msgstr "%s?UNIX????????"
+
+#: lib/active_samba_ldap/configuration.rb:338
 msgid "must be in %s"
 msgstr "%s????????????"
 
-#: lib/active_samba_ldap/samba_group_entry.rb:138
+#: lib/active_samba_ldap/samba_group_entry.rb:141
 msgid "invalid type: %s"
 msgstr "?????: %s"
 
-#: rails/plugin/active_samba_ldap/init.rb:10
+#: rails/init.rb:12
 msgid ""
 "You should run 'script/generator scaffold_active_samba_ldap' to make %s."
 msgstr ""
@@ -334,7 +338,7 @@
 msgid "illegal %s name: %s"
 msgstr "???%s?: %s"
 
-#: bin/asl-useradd:182 bin/asl-usermod:308
+#: bin/asl-useradd:182 bin/asl-usermod:309
 msgid "%s already exists: %s"
 msgstr "???????%s??: %s"
 
@@ -452,7 +456,7 @@
 msgid "enable this user"
 msgstr "???????????"
 
-#: bin/asl-usermod:234 bin/asl-usermod:238
+#: bin/asl-usermod:235 bin/asl-usermod:239
 msgid "not implemented."
 msgstr "??????????"
 


From null at cozmixng.org  Wed Sep 23 19:56:33 2009
From: null at cozmixng.org (null at cozmixng.org)
Date: Thu, 24 Sep 2009 08:56:33 +0900
Subject: [asl-commit] ActiveSambaLdap (trunk) r196: * 0.0.8 -> 0.0.9.
Message-ID: <20090923235633.F018B1D1CD5@mail.cozmixng.org>

retro	2009-09-24 08:56:32 +0900 (Thu, 24 Sep 2009)

  New Revision: 196

  Log:
    * 0.0.8 -> 0.0.9.
  Modified files:
    trunk/lib/active_samba_ldap/version.rb


  Modified: trunk/lib/active_samba_ldap/version.rb (+1 -1)
===================================================================
--- trunk/lib/active_samba_ldap/version.rb	2009-09-22 14:40:16 +09:00 (rev 195)
+++ trunk/lib/active_samba_ldap/version.rb	2009-09-24 08:56:32 -15:00 (rev 196)
@@ -1,3 +1,3 @@
 module ActiveSambaLdap
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end


From null at cozmixng.org  Wed Sep 23 19:56:18 2009
From: null at cozmixng.org (null at cozmixng.org)
Date: Thu, 24 Sep 2009 08:56:18 +0900
Subject: [asl-commit] ActiveSambaLdap (trunk) r193: * remove needless codes.
Message-ID: <20090923235619.6721F1D1CD0@mail.cozmixng.org>

retro	2009-09-24 08:56:17 +0900 (Thu, 24 Sep 2009)

  New Revision: 193

  Log:
    * remove needless codes.
  Modified files:
    trunk/rails/init.rb


  Modified: trunk/rails/init.rb (+1 -18)
===================================================================
--- trunk/rails/init.rb	2009-09-22 14:17:13 +09:00 (rev 192)
+++ trunk/rails/init.rb	2009-09-24 08:56:17 -15:00 (rev 193)
@@ -2,32 +2,15 @@
 
 ActiveSambaLdap::Base.logger ||= RAILS_DEFAULT_LOGGER
 
-required_version = ["0", "0", "6"]
-if (ActiveLdap::VERSION.split(".") <=> required_version) < 0
-  ActiveLdap::Base.class_eval do
-    format = _("You need ActiveSambaLdap %s or later")
-    logger.error(format % required_version.join("."))
-  end
-end
-
 ldap_configuration_file = File.join(RAILS_ROOT, 'config', 'ldap.yml')
 if File.exist?(ldap_configuration_file)
   ActiveSambaLdap::Base.configurations =
     ActiveSambaLdap::Configuration.read(ldap_configuration_file)
   ActiveSambaLdap::Base.setup_connection
 else
-  ActiveLdap::Base.class_eval do
+  ActiveSambaLdap::Base.class_eval do
     format = _("You should run 'script/generator scaffold_active_samba_ldap' " \
                "to make %s.")
     logger.error(format % ldap_configuration_file)
   end
 end
-
-class ActionView::Base
-  include ActiveLdap::Helper
-end
-
-require 'active_ldap/action_controller/ldap_benchmarking'
-class ActionController::Base
-  include ActiveLdap::ActionController::LdapBenchmarking
-end