Mailing-List: contact dev-help@directory.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Apache Directory Developers List" <dev@directory.apache.org>
Received-SPF: pass (nike.apache.org: domain of elecharny@gmail.com designates
 74.125.82.51 as permitted sender)
Message-ID: <545F1D75.7030903@gmail.com>
Date: Sun, 09 Nov 2014 08:53:25 +0100
From: =?UTF-8?B?RW1tYW51ZWwgTMOpY2hhcm55?= <elecharny@gmail.com>
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9;
 rv:24.0) Gecko/20100101 Thunderbird/24.6.0
MIME-Version: 1.0
To: dev@directory.apache.org
Subject: Re: 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.
References: <9fcd780da2424df1b91af5d971367123@git.apache.org>
In-Reply-To: <9fcd780da2424df1b91af5d971367123@git.apache.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Hmmmm...

That's extremely dubious that this change break anything.

Can you dump the entry content in both cases ?


Le 07/11/14 21:42, smckinney@apache.org a écrit :
> 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 );
>          }
>