[xwiki-notifications] r8173 - xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src/main/java/com/xpn/xwiki

[tmortagne (SVN)]

Author: tmortagne
Date: 2008-03-03 17:02:55 +0100 (Mon, 03 Mar 2008)
New Revision: 8173

Modified:
   xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java
Log:
Add missing LDAP property to XWiki.XWikiPreference class init.

Modified: xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java	2008-03-03 14:47:44 UTC (rev 8172)
+++ xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java	2008-03-03 16:02:55 UTC (rev 8173)
@@ -2554,9 +2554,11 @@
         
         needsUpdate |= bclass.addBooleanField("ldap", "Ldap", "yesno");
         needsUpdate |= bclass.addTextField("ldap_server", "Ldap server adress", 60);
-        needsUpdate |= bclass.addNumberField("ldap_port", "Ldap server port", 5, "int");
+        needsUpdate |= bclass.addTextField("ldap_port", "Ldap server port", 60);
         needsUpdate |= bclass.addTextField("ldap_bind_DN", "Ldap login matching", 60);
         needsUpdate |= bclass.addTextField("ldap_bind_pass", "Ldap password matching", 60);
+        needsUpdate |=
+            bclass.addBooleanField("ldap_validate_password", "Validate Ldap user/password", "yesno");
         needsUpdate |= bclass.addTextField("ldap_user_group", "Ldap group filter", 60);
         needsUpdate |= bclass.addTextField("ldap_base_DN", "Ldap base DN", 60);
         needsUpdate |= bclass.addTextField("ldap_UID_attr", "Ldap base DN", 60);
@@ -2565,11 +2567,10 @@
             bclass.addBooleanField("ldap_update_user", "Update user from LDAP", "yesno");
         needsUpdate |= bclass.addTextField("group_mapping", "Ldap groups mapping", 80);
         needsUpdate |=
-            bclass.addNumberField("ldap_groupcache_expiration", "LDAP groups members cache", 10,
-                "long");
+            bclass.addTextField("ldap_groupcache_expiration", "LDAP groups members cache", 60);
         needsUpdate |=
             bclass.addStaticListField("ldap_mode_group_sync", "LDAP groups sync mode",
-                "always|create");
+                "|always|create");
         needsUpdate |= bclass.addBooleanField("ldap_trylocal", "Try local login", "yesno");
         
         /////