directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-core git commit: rolled back change to OrganizationalUnitDAO create method. Combining create default entry into one call broke the fortress base data loads.
Date Fri, 07 Nov 2014 20:42:33 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master 43d4a2387 -> 77de284f7


rolled back change to OrganizationalUnitDAO create method.  Combining create default entry
into one call broke the fortress base data loads.


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/77de284f
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/77de284f
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/77de284f

Branch: refs/heads/master
Commit: 77de284f785f26ebc3756706501cc3d6a8dc4f3a
Parents: 43d4a23
Author: Shawn McKinney <smckinney@apache.org>
Authored: Fri Nov 7 14:41:35 2014 -0600
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Fri Nov 7 14:41:35 2014 -0600

----------------------------------------------------------------------
 .../fortress/core/ldap/container/OrganizationalUnitDAO.java   | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/77de284f/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java
----------------------------------------------------------------------
diff --git 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
index 551362e..a2bead8 100755
--- 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
@@ -108,10 +108,17 @@ final class OrganizationalUnitDAO extends ApacheDsDataProvider
         try
         {
             LOG.info( "create container dn [{}]",  nodeDn );
+            Entry myEntry = new DefaultEntry( nodeDn );
+            myEntry.add( GlobalIds.OBJECT_CLASS, ORGUNIT_OBJ_CLASS );
+            myEntry.add( GlobalIds.OU, oe.getName() );
+            myEntry.add( GlobalIds.DESC, oe.getDescription() );
+
+            /*
             Entry myEntry = new DefaultEntry( nodeDn,
                 GlobalIds.OBJECT_CLASS, ORGUNIT_OBJ_CLASS,
                 GlobalIds.OU, oe.getName(),
                 GlobalIds.DESC, oe.getDescription() );
+*/
             ld = getAdminConnection();
             add( ld, myEntry );
         }


Mime
View raw message