From 428d828ca640d1348979f9982d1c0bc0a489a3b4 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Thu, 12 Dec 2013 14:13:36 +0100 Subject: Properties preserve and respect the PropertyDescription 'isMutable' property. This setting prevents the WriteProperty predefined step from changing the property value when isMutable is false. WriteProperty also requires the selected property to already exist - they should be created either during Item instantiation or using AddC2KObject. LDAPPropertyManager prepends the Property name in its entries with ! if they are non mutable. Various places around the kernel that create properties now set the mutable field. Fixes #150 --- src/main/java/com/c2kernel/lookup/LDAPLookup.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/main/java/com/c2kernel/lookup/LDAPLookup.java') diff --git a/src/main/java/com/c2kernel/lookup/LDAPLookup.java b/src/main/java/com/c2kernel/lookup/LDAPLookup.java index 996ca0e..23d30d4 100644 --- a/src/main/java/com/c2kernel/lookup/LDAPLookup.java +++ b/src/main/java/com/c2kernel/lookup/LDAPLookup.java @@ -45,7 +45,7 @@ public class LDAPLookup private LDAPConnection mLDAPConn; private final LDAPProperties mLDAPProps; private final NextKeyManager mNextKeyManager; - private LDAPPropertyManager mPropManager; + private final LDAPPropertyManager mPropManager; private final LDAPRoleManager mRoleManager; @@ -73,14 +73,7 @@ public class LDAPLookup mNextKeyManager = new NextKeyManager(this, "cn=last,"+EntityPath.mTypeRoot); Logger.msg(7, "LDAP.useOldProps="+Gateway.getProperty("LDAP.useOldProps", "false")); - if (Gateway.getProperty("LDAP.useOldProps", "false").equals("true")) { - Logger.debug(1, "Using Kernel 2.1 LDAP Property Format"); - mPropManager = new LegacyLDAPPropertyManager(this); - } - else { - Logger.debug(1, "Using Kernel 2.2 LDAP Property Format"); - mPropManager = new LDAPPropertyManager(this); - } + mPropManager = new LDAPPropertyManager(this); mRoleManager = new LDAPRoleManager(this, "cn=agent,"+DomainPath.mTypeRoot, EntityPath.mTypeRoot); } -- cgit v1.2.3