directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cp...@apache.org
Subject [08/10] directory-fortress-core git commit: added ftProps as optional attribute of Group to support property manager
Date Mon, 28 Nov 2016 21:13:35 GMT
added ftProps as optional attribute of Group to support property manager


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/11941177
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/11941177
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/11941177

Branch: refs/heads/master
Commit: 1194117792d4f5c484cc68e26ce97c596d94d364
Parents: 6911074
Author: clp207 <clp207@psu.edu>
Authored: Mon Nov 28 08:41:13 2016 -0500
Committer: clp207 <clp207@psu.edu>
Committed: Mon Nov 28 08:41:13 2016 -0500

----------------------------------------------------------------------
 config/fortress.properties.src                                  | 5 ++++-
 ldap/schema/fortress.schema                                     | 5 ++++-
 .../java/org/apache/directory/fortress/core/impl/GroupDAO.java  | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/11941177/config/fortress.properties.src
----------------------------------------------------------------------
diff --git a/config/fortress.properties.src b/config/fortress.properties.src
index 9bc135f..6c83415 100755
--- a/config/fortress.properties.src
+++ b/config/fortress.properties.src
@@ -107,4 +107,7 @@ GroupTest=org.apache.directory.fortress.core.group.GroupAntTest
 
 # Default behaviour when creating a user with no password is to set userPassword set to an
empty string. 
 #The Fortress API will not allow auth binding if password is empty string or null, but enabling
this property will cause the userPassword field to not be created. 
-#user.creation.field.password.disable=false
\ No newline at end of file
+#user.creation.field.password.disable=false
+
+#attribute to use for group properties
+group.properties=ftProps
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/11941177/ldap/schema/fortress.schema
----------------------------------------------------------------------
diff --git a/ldap/schema/fortress.schema b/ldap/schema/fortress.schema
index 8559344..f1904d7 100644
--- a/ldap/schema/fortress.schema
+++ b/ldap/schema/fortress.schema
@@ -472,7 +472,10 @@ objectClass ( ftObId:8
          configProtocol $
          ftType
          )
-    MAY configParameter
+    MAY (
+    	configParameter $
+    	ftProps
+    	)
     )
 
 ## OC9: Fortress Permission Attribute Set Structural Object Class

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/11941177/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java
index d951834..3dea0fe 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java
@@ -81,7 +81,7 @@ final class GroupDAO extends LdapDataProvider implements PropertyProvider<Group>
         GROUP_PROTOCOL_ATTR_IMPL = Config.getInstance().getProperty( GROUP_PROTOCOL_ATTR
);
         GROUP_PROPERTY_ATTR_IMPL = Config.getInstance().getProperty( GROUP_PROPERTY_ATTR
);
         
-        GROUP_OBJ_CLASS = new String[]{SchemaConstants.TOP_OC, GROUP_OBJECT_CLASS_IMPL, GlobalIds.PROPS_AUX_OBJECT_CLASS_NAME
};
+        GROUP_OBJ_CLASS = new String[]{SchemaConstants.TOP_OC, GROUP_OBJECT_CLASS_IMPL };
         
         GROUP_ATRS = new String[]
             {


Mime
View raw message