You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2014/11/10 16:01:41 UTC
[5/5] directory-fortress-core git commit: merged with Shawn's changes
merged with Shawn's changes
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/50c0cc00
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/50c0cc00
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/50c0cc00
Branch: refs/heads/master
Commit: 50c0cc0058d0be04290cdb7892ab49104849d591
Parents: 0913c70 55358f9
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Mon Nov 10 16:01:24 2014 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Mon Nov 10 16:01:24 2014 +0100
----------------------------------------------------------------------
ldap/setup/CommanderDemoUsers.xml | 80 ----
ldap/setup/DelegatedAdminManagerLoad.xml | 224 +++++-----
ldap/setup/FortressDemoUsers.xml | 7 +-
ldap/setup/refreshLDAPData-src.xml | 7 +-
.../ldap/container/OrganizationalUnitDAO.java | 7 +
.../fortress/core/ldap/suffix/SuffixDAO.java | 6 +
.../directory/fortress/core/overview.html | 28 +-
.../fortress/core/rbac/DelAccessMgrImpl.java | 2 +-
.../fortress/core/rbac/DelAdminMgrImpl.java | 12 +-
.../directory/fortress/core/rest/RestUtils.java | 2 +-
.../fortress/core/rbac/AdminRoleTestData.java | 4 +-
.../fortress/core/rbac/UserTestData.java | 442 +++++++++----------
12 files changed, 377 insertions(+), 444 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/50c0cc00/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java
----------------------------------------------------------------------
diff --cc src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java
index 33d7387,5d03437..4d0c012
--- a/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java
@@@ -109,10 -108,12 +109,17 @@@ final class OrganizationalUnitDAO exten
try
{
LOG.info( "create container dn [{}]", nodeDn );
+
Entry myEntry = new DefaultEntry( nodeDn,
++<<<<<<< HEAD
+ SchemaConstants.OBJECT_CLASS_AT, ORGUNIT_OBJ_CLASS,
+ SchemaConstants.OU_AT, oe.getName(),
++=======
+ GlobalIds.OBJECT_CLASS, ORGUNIT_CLASS,
+ GlobalIds.OU, oe.getName(),
++>>>>>>> 55358f9c9d15e549e0121cc1b3cddd4a06d1f4ae
GlobalIds.DESC, oe.getDescription() );
+
ld = getAdminConnection();
add( ld, myEntry );
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/50c0cc00/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
----------------------------------------------------------------------
diff --cc src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
index 0ee8b76,ead33dc..a269b91
--- a/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
@@@ -94,11 -94,13 +94,17 @@@ final class SuffixDAO extends ApacheDsD
String nodeDn = getDn( se );
try
{
- LOG.info( "create suffix dn [" + nodeDn + "]" );
+ LOG.info( "create suffix dn [{}]", nodeDn );
Entry myEntry = new DefaultEntry( nodeDn );
++<<<<<<< HEAD
+ myEntry.add( SchemaConstants.OBJECT_CLASS_AT, SUFFIX_OBJ_CLASS );
++=======
+ myEntry.add( GlobalIds.OBJECT_CLASS, SUFFIX_OBJ_CLASS );
+ myEntry.add( GlobalIds.OBJECT_CLASS, SUFFIX_OBJ_CLASS );
++>>>>>>> 55358f9c9d15e549e0121cc1b3cddd4a06d1f4ae
myEntry.add( SchemaConstants.DC_AT, se.getName() );
myEntry.add( SchemaConstants.O_AT, se.getDescription() );
+
ld = getAdminConnection();
add( ld, myEntry );
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/50c0cc00/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
----------------------------------------------------------------------