Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5F531174BE for ; Fri, 7 Nov 2014 20:42:33 +0000 (UTC) Received: (qmail 74629 invoked by uid 500); 7 Nov 2014 20:42:33 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 74592 invoked by uid 500); 7 Nov 2014 20:42:33 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 74582 invoked by uid 99); 7 Nov 2014 20:42:33 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Nov 2014 20:42:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0627399D674; Fri, 7 Nov 2014 20:42:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: smckinney@apache.org To: commits@directory.apache.org Message-Id: <9fcd780da2424df1b91af5d971367123@git.apache.org> X-Mailer: ASF-Git Admin Mailer 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, 7 Nov 2014 20:42:33 +0000 (UTC) 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 Authored: Fri Nov 7 14:41:35 2014 -0600 Committer: Shawn McKinney 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 ); }