You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@directory.apache.org by Emmanuel Lecharny <el...@gmail.com> on 2011/10/07 13:13:52 UTC
Re: [ADS 2.0] OSGi : solving package conflicts
Hi,
the following packages are conflicting. I suggest the following
moifications to fix those conflicts :
/org/apache/directory/server ./apacheds/http-directory-bridge
> /org/apache/directory/server ./apacheds/service
> /org/apache/directory/server ./apacheds/wrapper ->
> /org/apache/directory/server/wrapper
> /org/apache/directory/server/config ./apacheds/server-config
> /org/apache/directory/server/config ./apacheds/service-builder ->
> /org/apache/directory/server/config/builder
> /org/apache/directory/server/core ./apacheds/core
> /org/apache/directory/server/core ./apacheds/core-api ->
> /org/apache/directory/server/core/api
> /org/apache/directory/server/core/changelog ./apacheds/core
> /org/apache/directory/server/core/changelog ./apacheds/core-api ->
> /org/apache/directory/server/core/api/changelog
> /org/apache/directory/server/core/event ./apacheds/core
> /org/apache/directory/server/core/event ./apacheds/core-api ->
> /org/apache/directory/server/core/api/event
> /org/apache/directory/server/core/interceptor ./apacheds/core
> /org/apache/directory/server/core/interceptor ./apacheds/core-api ->
> /org/apache/directory/server/core/api/interceptor
> /org/apache/directory/server/core/journal ./apacheds/core
> /org/apache/directory/server/core/journal ./apacheds/core-api ->
> /org/apache/directory/server/core/api/journal
> /org/apache/directory/server/core/partition ./apacheds/core
> /org/apache/directory/server/core/partition ./apacheds/core-api ->
> /org/apache/directory/server/core/api/partition
> /org/apache/directory/server/core/partition ./apacheds/ldif-partition
> -> /org/apache/directory/server/core/partition/impl
> /org/apache/directory/server/core/replication ./apacheds/core
> /org/apache/directory/server/core/replication ./apacheds/core-api ->
> /org/apache/directory/server/core/api/replication
> /org/apache/directory/server/core/schema ./apacheds/core
> /org/apache/directory/server/core/schema ./apacheds/core-api ->
> /org/apache/directory/server/core/api/schema
> /org/apache/directory/server/core/schema ./apacheds/jdbm-partition ->
> /org/apache/directory/server/core/schema/jdbm
This is not a conflict (test) :
> /org/apache/directory/server/kerberos/kdc ./apacheds/kerberos-test
> /org/apache/directory/server/kerberos/kdc ./apacheds/protocol-kerberos
> /org/apache/directory/server/kerberos/protocol
> ./apacheds/kerberos-codec ->
> /org/apache/directory/server/kerberos/protocol/codec
> /org/apache/directory/server/kerberos/protocol
> ./apacheds/protocol-kerberos
> /org/apache/directory/server/ldap/handlers/extended
> ./apacheds/protocol-ldap
> /org/apache/directory/server/ldap/handlers/extended
> ./apacheds/server-tools ->
> /org/apache/directory/server/ldap/handlers/extended/tools
> /org/apache/directory/shared/ldap/codec/osgi ./shared/ldap/codec/core
> /org/apache/directory/shared/ldap/codec/osgi
> ./shared/ldap/codec/standalone ->
> /org/apache/directory/shared/ldap/codec/osgi/standalone
> /org/apache/directory/shared/ldap/codec/osgi
> ./shared/ldap/extras/codec ->
> /org/apache/directory/shared/ldap/codec/osgi/extras
> /org/apache/directory/shared/ldap/extras/controls/ppolicy
> ./shared/ldap/extras/codec
> /org/apache/directory/shared/ldap/extras/controls/ppolicy
> ./shared/ldap/extras/codec-api ->
> /org/apache/directory/shared/ldap/extras/controls/ppolicy/api
Thoughts ?
--
Regards,
Cordialement,
Emmanuel Lécharny
www.iktek.com
Re: [ADS 2.0] OSGi : solving package conflicts
Posted by Göktürk Gezer <go...@gmail.com>.
Hi Stefan,
Thank you for that. I would create a patch but, it is still not the best
way. I'm waiting for you then.
Regards,
Gokturk
On Sun, Oct 9, 2011 at 7:39 PM, Stefan Seelmann <se...@apache.org> wrote:
> Hi Göktürk,
>
> I agree that it doesn't make sense to rename packages as a
> non-committer. When applying the patch only the contents of the files
> would be move but SVN history would get lost. I'll try to redo your
> changes and give feedback.
>
> Kind Regards,
> Stefan
Re: [ADS 2.0] OSGi : solving package conflicts
Posted by Stefan Seelmann <se...@apache.org>.
Hi Göktürk,
I agree that it doesn't make sense to rename packages as a
non-committer. When applying the patch only the contents of the files
would be move but SVN history would get lost. I'll try to redo your
changes and give feedback.
Kind Regards,
Stefan
On Sat, Oct 8, 2011 at 5:12 PM, Göktürk Gezer <go...@gmail.com> wrote:
> Hi,
> I attached a patch that solves these package conflicts. But i'm still unsure
> about working on trunk.Package renamings are something hard to describe as
> diff. Right now, this diff zeroes the old package contents, add new ones and
> modify other parts of code to use new packages. i can also create a script
> to make your local copy consistent after patch, and then you can commit like
> that. So, guide me to the correct way of doing it.
> Here is a change list:
> /org/apache/directory/server ./apacheds/http-directory-bridge
> -> changed to /org/apache/directory/server/bridge/http
> /org/apache/directory/server ./apacheds/service
> /org/apache/directory/server ./apacheds/wrapper ->
> /org/apache/directory/server/wrapper
> -> changed as suggested
> ------------------------------------------------------------------------------------------------------------------------
> /org/apache/directory/server/config ./apacheds/server-config
> /org/apache/directory/server/config ./apacheds/service-builder ->
> /org/apache/directory/server/config/builder
> /org/apache/directory/server/core ./apacheds/core
> /org/apache/directory/server/core ./apacheds/core-api ->
> /org/apache/directory/server/core/api
> /org/apache/directory/server/core/changelog ./apacheds/core
> /org/apache/directory/server/core/changelog ./apacheds/core-api ->
> /org/apache/directory/server/core/api/changelog
> /org/apache/directory/server/core/event ./apacheds/core
> /org/apache/directory/server/core/event ./apacheds/core-api ->
> /org/apache/directory/server/core/api/event
> /org/apache/directory/server/core/interceptor ./apacheds/core
> /org/apache/directory/server/core/interceptor ./apacheds/core-api ->
> /org/apache/directory/server/core/api/interceptor
> /org/apache/directory/server/core/journal ./apacheds/core
> /org/apache/directory/server/core/journal ./apacheds/core-api ->
> /org/apache/directory/server/core/api/journal
> /org/apache/directory/server/core/partition ./apacheds/core
> /org/apache/directory/server/core/partition ./apacheds/core-api ->
> /org/apache/directory/server/core/api/partition
> /org/apache/directory/server/core/partition ./apacheds/ldif-partition ->
> /org/apache/directory/server/core/partition/impl
> -> was test package, changed to
> /org/apache/directory/server/core/partition/ldif
> /org/apache/directory/server/core/replication ./apacheds/core
> /org/apache/directory/server/core/replication ./apacheds/core-api ->
> /org/apache/directory/server/core/api/replication
> /org/apache/directory/server/core/schema ./apacheds/core
> /org/apache/directory/server/core/schema ./apacheds/core-api ->
> /org/apache/directory/server/core/api/schema
> /org/apache/directory/server/core/schema ./apacheds/jdbm-partition ->
> /org/apache/directory/server/core/schema/jdbm
> -> was test package, changed as suggested.
>
> -> All packages(source and test) under apacheds-api is moved into
> org/apache/directory/server/core/api package
> -> DefaultPartitionNexus class is moved from apacheds-core to
> apacheds-core-api to defeat cyclic builds
> --------------------------------------------------------------------------------------------------------------------------
> This is not a conflict (test) :
> /org/apache/directory/server/kerberos/kdc ./apacheds/kerberos-test
> /org/apache/directory/server/kerberos/kdc ./apacheds/protocol-kerberos
> ---------------------------------------------------------------------------------------------------------------------------
> /org/apache/directory/server/kerberos/protocol ./apacheds/kerberos-codec ->
> /org/apache/directory/server/kerberos/protocol/codec
> -> changed as suggested
> /org/apache/directory/server/kerberos/protocol ./apacheds/protocol-kerberos
> ------------------------------------------------------------------------------------------------------------------------------
> /org/apache/directory/server/ldap/handlers/extended ./apacheds/protocol-ldap
> /org/apache/directory/server/ldap/handlers/extended ./apacheds/server-tools
> -> /org/apache/directory/server/ldap/handlers/extended/tools
> -> server-tools project was out of the build. left untouched
> --------------------------------------------------------------------------------------------------------------------------------------
> /org/apache/directory/shared/ldap/codec/osgi ./shared/ldap/codec/core
> /org/apache/directory/shared/ldap/codec/osgi ./shared/ldap/codec/standalone
> -> /org/apache/directory/shared/ldap/codec/osgi/standalone
> -> was test package, changed as suggested
> /org/apache/directory/shared/ldap/codec/osgi ./shared/ldap/extras/codec ->
> /org/apache/directory/shared/ldap/codec/osgi/extras
> -> was test package, changed as suggested
> -----------------------------------------------------------------------------------------------------------------------------------
> /org/apache/directory/shared/ldap/extras/controls/ppolicy
> ./shared/ldap/extras/codec
> /org/apache/directory/shared/ldap/extras/controls/ppolicy
> ./shared/ldap/extras/codec-api ->
> /org/apache/directory/shared/ldap/extras/controls/ppolicy/api
> -> changed as suggested
> Regards,
> Gokturk
Re: [ADS 2.0] OSGi : solving package conflicts
Posted by Göktürk Gezer <go...@gmail.com>.
Patch to package conflicts.
Re: [ADS 2.0] OSGi : solving package conflicts
Posted by Stefan Seelmann <se...@apache.org>.
> Packages are fine now, thanks. About core-api, Emmanuel thinks the same, moving all packages org.apache.directory.server.core.api parent.
Done
> Package renamings have broken the apacheds-service BTW. Its Just a harcoded class name. diff to fix attached.
Thanks for the patch, applied to trunk.
Re: [ADS 2.0] OSGi : solving package conflicts
Posted by Göktürk Gezer <go...@gmail.com>.
Hi Stefan,
Packages are fine now, thanks. About core-api, Emmanuel thinks the same,
moving all packages org.apache.directory.server.core.api parent.
Package renamings have broken the apacheds-service BTW. Its Just a harcoded
class name. diff to fix attached.
Regards,
Gokturk
Re: [ADS 2.0] OSGi : solving package conflicts
Posted by Stefan Seelmann <se...@apache.org>.
On Sun, Oct 9, 2011 at 10:55 PM, Stefan Seelmann <se...@apache.org>wrote:
> On Sun, Oct 9, 2011 at 9:02 PM, Stefan Seelmann <se...@apache.org>wrote:
>
>> On Sat, Oct 8, 2011 at 5:12 PM, Göktürk Gezer <go...@gmail.com>wrote:
>>
>>> Hi,
>>> I attached a patch that solves these package conflicts. But i'm still
>>> unsure about working on trunk.Package renamings are something hard to
>>> describe as diff. Right now, this diff zeroes the old package contents, add
>>> new ones and modify other parts of code to use new packages. i can also
>>> create a script to make your local copy consistent after patch, and then you
>>> can commit like that. So, guide me to the correct way of doing it.
>>>
>>> Here is a change list:
>>>
>>> /org/apache/directory/server ./apacheds/http-directory-bridge
>>> -> changed to /org/apache/directory/server/bridge/http
>>>
>>
>> done
>>
>>
>>> /org/apache/directory/server ./apacheds/service
>>>
>>> /org/apache/directory/server ./apacheds/wrapper ->
>>> /org/apache/directory/server/wrapper
>>> -> changed as suggested
>>>
>>
>> done
>> also changed reference to ApacheDsTanukiWrapper in
>> installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf
>>
>>
>>>
>>> /org/apache/directory/server/config ./apacheds/server-config
>>> /org/apache/directory/server/config ./apacheds/service-builder ->
>>> /org/apache/directory/server/config/builder
>>>
>>
>> done
>>
>> I committed the previous changes. The next changes are a bit more tricky
>> as those guys are also used in Studio.
>>
>>
>>> /org/apache/directory/server/core ./apacheds/core
>>> /org/apache/directory/server/core ./apacheds/core-api ->
>>> /org/apache/directory/server/core/api
>>>
>>
> done
> Made CacheService constructor public. Should this class be moved to
> apacheds-core?
>
>
>> /org/apache/directory/server/core/changelog ./apacheds/core
>>> /org/apache/directory/server/core/changelog ./apacheds/core-api ->
>>> /org/apache/directory/server/core/api/changelog
>>>
>>
> done
>
> /org/apache/directory/server/core/event ./apacheds/core
>>> /org/apache/directory/server/core/event ./apacheds/core-api ->
>>> /org/apache/directory/server/core/api/event
>>>
>>
> done
> Made RegistrationEntry constructor and method public.
>
>
>> /org/apache/directory/server/core/interceptor ./apacheds/core
>>> /org/apache/directory/server/core/interceptor ./apacheds/core-api ->
>>> /org/apache/directory/server/core/api/interceptor
>>>
>>
> done, including interceptor.context package
>
>
>> /org/apache/directory/server/core/journal ./apacheds/core
>>>
>> /org/apache/directory/server/core/journal ./apacheds/core-api ->
>>> /org/apache/directory/server/core/api/journal
>>>
>>
> done
>
> /org/apache/directory/server/core/partition ./apacheds/core
>>> /org/apache/directory/server/core/partition ./apacheds/core-api ->
>>> /org/apache/directory/server/core/api/partition
>>>
>> /org/apache/directory/server/core/partition ./apacheds/ldif-partition ->
>>> /org/apache/directory/server/core/partition/impl
>>> -> was test package, changed to
>>> /org/apache/directory/server/core/partition/ldif
>>>
>>
> done, good catch with the test package
>
> /org/apache/directory/server/core/replication ./apacheds/core
>>> /org/apache/directory/server/core/replication ./apacheds/core-api ->
>>> /org/apache/directory/server/core/api/replication
>>>
>>
> Can't find this package, has this been moved before?
>
> /org/apache/directory/server/core/schema ./apacheds/core
>>> /org/apache/directory/server/core/schema ./apacheds/core-api ->
>>> /org/apache/directory/server/core/api/schema
>>>
>>
> done, but the classes in that package should be reviews and eventually
> moved to apacheds-core
>
> /org/apache/directory/server/core/schema ./apacheds/jdbm-partition ->
>>> /org/apache/directory/server/core/schema/jdbm
>>>
>>
> Moved PartitionSchemaLoaderTest from jdbm-partition to core-integ as
> described in a TODO within that class, removed the package.
>
>
> -> All packages(source and test) under apacheds-api is moved into
>>> org/apache/directory/server/core/api package
>>>
>>
> Do you mean you renamed all packages even those that are not conflicting? I
> didn't renamed those in the first step but I agree that it makes sense to do
> so. However before that we should review if those packages belong to the
> "api" module. The remaining packages are
> - org.apache.directory.server.core.administrative
> - org.apache.directory.server.core.entry
> - org.apache.directory.server.core.filtering
> - org.apache.directory.server.core.invocation
> - org.apache.directory.server.core.schema.registries.synchronizers
>
>
>> -> DefaultPartitionNexus class is moved from apacheds-core to
>>> apacheds-core-api to defeat cyclic builds
>>>
>>
> That was not required, there were just unused imports that I deleted.
>
>
> When I run the test I saw that LdapConnectionFactory (in
> shared-ldap-client-api) has a method getCoreSessionConnection() the creates
> an instance of LdapCoreSessionConnection via reflection. IMO this should be
> moved to some ApacheDS module.
>
> Committed so far.
>
>
>>> --------------------------------------------------------------------------------------------------------------------------
>>> This is not a conflict (test) :
>>> /org/apache/directory/server/kerberos/kdc ./apacheds/kerberos-test
>>> /org/apache/directory/server/kerberos/kdc ./apacheds/protocol-kerberos
>>>
>>> ---------------------------------------------------------------------------------------------------------------------------
>>> /org/apache/directory/server/kerberos/protocol ./apacheds/kerberos-codec
>>> -> /org/apache/directory/server/kerberos/protocol/codec
>>> -> changed as suggested
>>> /org/apache/directory/server/kerberos/protocol
>>> ./apacheds/protocol-kerberos
>>>
>>
done
>
>>> ------------------------------------------------------------------------------------------------------------------------------
>>> /org/apache/directory/server/ldap/handlers/extended
>>> ./apacheds/protocol-ldap
>>> /org/apache/directory/server/ldap/handlers/extended
>>> ./apacheds/server-tools ->
>>> /org/apache/directory/server/ldap/handlers/extended/tools
>>> -> server-tools project was out of the build. left untouched
>>>
>>> --------------------------------------------------------------------------------------------------------------------------------------
>>> /org/apache/directory/shared/ldap/codec/osgi ./shared/ldap/codec/core
>>> /org/apache/directory/shared/ldap/codec/osgi
>>> ./shared/ldap/codec/standalone ->
>>> /org/apache/directory/shared/ldap/codec/osgi/standalone
>>> -> was test package, changed as suggested
>>>
>>
Renamed to /org/apache/directory/shared/ldap/codec/standalone, same as the
main package. But the only test there (AbstractCodecServiceTest) is
abstract and there is no subclass so makes not really sense to keep that
class or can we create another real test?
Also deleted package org.apache.directory.shared.ldap.codec.controls and
class OpaqueControlTest as the same test is already in shared-ldap-model.
> /org/apache/directory/shared/ldap/codec/osgi ./shared/ldap/extras/codec
>>> -> /org/apache/directory/shared/ldap/codec/osgi/extras
>>> -> was test package, changed as suggested
>>>
>>
Renamed to /org/apache/directory/shared/ldap/extras, same as the main
package name.
Made DefaultLdapCodecService() constructor public.
>
>>> -----------------------------------------------------------------------------------------------------------------------------------
>>> /org/apache/directory/shared/ldap/extras/controls/ppolicy
>>> ./shared/ldap/extras/codec
>>> /org/apache/directory/shared/ldap/extras/controls/ppolicy
>>> ./shared/ldap/extras/codec-api ->
>>> /org/apache/directory/shared/ldap/extras/controls/ppolicy/api
>>>
>>
Rather renamed the package in shared/ldap/extras/codec ->
/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl to be
consistent with the other package names in that module.
I hope that's all, except the remaining package names in core-api. If I
forgot something please ping me.
Kind Regards,
Stefan
Re: [ADS 2.0] OSGi : solving package conflicts
Posted by Stefan Seelmann <se...@apache.org>.
I wasn't able to commit the remaining stuff this morning because I have test
failures. I'll continue later tonight.
Kind Regards,
Stefan
On Sun, Oct 9, 2011 at 11:30 PM, Göktürk Gezer <go...@gmail.com>wrote:
>
>
> On Sun, Oct 9, 2011 at 11:55 PM, Stefan Seelmann <se...@apache.org>wrote:
>
>>
>>
>> On Sun, Oct 9, 2011 at 9:02 PM, Stefan Seelmann <se...@apache.org>wrote:
>>
>>> On Sat, Oct 8, 2011 at 5:12 PM, Göktürk Gezer <go...@gmail.com>wrote:
>>>
>>>> Hi,
>>>> I attached a patch that solves these package conflicts. But i'm still
>>>> unsure about working on trunk.Package renamings are something hard to
>>>> describe as diff. Right now, this diff zeroes the old package contents, add
>>>> new ones and modify other parts of code to use new packages. i can also
>>>> create a script to make your local copy consistent after patch, and then you
>>>> can commit like that. So, guide me to the correct way of doing it.
>>>>
>>>> Here is a change list:
>>>>
>>>> /org/apache/directory/server ./apacheds/http-directory-bridge
>>>> -> changed to /org/apache/directory/server/bridge/http
>>>>
>>>
>>> done
>>>
>>>
>>>> /org/apache/directory/server ./apacheds/service
>>>>
>>>> /org/apache/directory/server ./apacheds/wrapper ->
>>>> /org/apache/directory/server/wrapper
>>>> -> changed as suggested
>>>>
>>>
>>> done
>>> also changed reference to ApacheDsTanukiWrapper in
>>> installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf
>>>
>>>
>>>>
>>>> /org/apache/directory/server/config ./apacheds/server-config
>>>> /org/apache/directory/server/config ./apacheds/service-builder ->
>>>> /org/apache/directory/server/config/builder
>>>>
>>>
>>> done
>>>
>>> I committed the previous changes. The next changes are a bit more tricky
>>> as those guys are also used in Studio.
>>>
>>>
>>>> /org/apache/directory/server/core ./apacheds/core
>>>> /org/apache/directory/server/core ./apacheds/core-api ->
>>>> /org/apache/directory/server/core/api
>>>>
>>>
>> done
>> Made CacheService constructor public. Should this class be moved to
>> apacheds-core?
>>
> i found no beneficial usage for it on apacheds-core-api.
>
>>
>>
>>> /org/apache/directory/server/core/changelog ./apacheds/core
>>>> /org/apache/directory/server/core/changelog ./apacheds/core-api ->
>>>> /org/apache/directory/server/core/api/changelog
>>>>
>>>
>> done
>>
>> /org/apache/directory/server/core/event ./apacheds/core
>>>> /org/apache/directory/server/core/event ./apacheds/core-api ->
>>>> /org/apache/directory/server/core/api/event
>>>>
>>>
>> done
>> Made RegistrationEntry constructor and method public.
>>
> I was cautios about contructor visibilities, but they're necessary. I hope
> they're not meant to be privite.
>
>>
>>
>>> /org/apache/directory/server/core/interceptor ./apacheds/core
>>>> /org/apache/directory/server/core/interceptor ./apacheds/core-api ->
>>>> /org/apache/directory/server/core/api/interceptor
>>>>
>>>
>> done, including interceptor.context package
>>
>>
>>> /org/apache/directory/server/core/journal ./apacheds/core
>>>>
>>> /org/apache/directory/server/core/journal ./apacheds/core-api ->
>>>> /org/apache/directory/server/core/api/journal
>>>>
>>>
>> done
>>
>> /org/apache/directory/server/core/partition ./apacheds/core
>>>> /org/apache/directory/server/core/partition ./apacheds/core-api ->
>>>> /org/apache/directory/server/core/api/partition
>>>>
>>> /org/apache/directory/server/core/partition ./apacheds/ldif-partition ->
>>>> /org/apache/directory/server/core/partition/impl
>>>> -> was test package, changed to
>>>> /org/apache/directory/server/core/partition/ldif
>>>>
>>>
>> done, good catch with the test package
>>
>> /org/apache/directory/server/core/replication ./apacheds/core
>>>> /org/apache/directory/server/core/replication ./apacheds/core-api ->
>>>> /org/apache/directory/server/core/api/replication
>>>>
>>>
>> Can't find this package, has this been moved before?
>>
> Yes i guess, i couldn't find it too.
>
>>
>> /org/apache/directory/server/core/schema ./apacheds/core
>>>> /org/apache/directory/server/core/schema ./apacheds/core-api ->
>>>> /org/apache/directory/server/core/api/schema
>>>>
>>>
>> done, but the classes in that package should be reviews and eventually
>> moved to apacheds-core
>>
>> /org/apache/directory/server/core/schema ./apacheds/jdbm-partition ->
>>>> /org/apache/directory/server/core/schema/jdbm
>>>>
>>>
>> Moved PartitionSchemaLoaderTest from jdbm-partition to core-integ as
>> described in a TODO within that class, removed the package.
>>
>>
>> -> All packages(source and test) under apacheds-api is moved into
>>>> org/apache/directory/server/core/api package
>>>>
>>>
>> Do you mean you renamed all packages even those that are not conflicting?
>> I didn't renamed those in the first step but I agree that it makes sense to
>> do so. However before that we should review if those packages belong to the
>> "api" module. The remaining packages are
>> - org.apache.directory.server.core.administrative
>> - org.apache.directory.server.core.entry
>> - org.apache.directory.server.core.filtering
>> - org.apache.directory.server.core.invocation
>> - org.apache.directory.server.core.schema.registries.synchronizers
>>
>
> Yes i renamed all even if they're not conflicting. It seems neater to me.
>
>>
>>
>>> -> DefaultPartitionNexus class is moved from apacheds-core to
>>>> apacheds-core-api to defeat cyclic builds
>>>>
>>>
>> That was not required, there were just unused imports that I deleted.
>>
> Yeah, that's better. I didn't look closely at how it's used in core-api.
>
>>
>>
>> When I run the test I saw that LdapConnectionFactory (in
>> shared-ldap-client-api) has a method getCoreSessionConnection() the creates
>> an instance of LdapCoreSessionConnection via reflection. IMO this should be
>> moved to some ApacheDS module.
>>
> I handled that by just renaming that package name to its new name. This
> class is being heavily used by ApacheDS modules for testing, having it in
> some ApacheDS module means more.
>
>>
>> Committed so far.
>>
>
> Thanks.
>
>
>>
>>
>>>> --------------------------------------------------------------------------------------------------------------------------
>>>> This is not a conflict (test) :
>>>> /org/apache/directory/server/kerberos/kdc ./apacheds/kerberos-test
>>>> /org/apache/directory/server/kerberos/kdc ./apacheds/protocol-kerberos
>>>>
>>>> ---------------------------------------------------------------------------------------------------------------------------
>>>> /org/apache/directory/server/kerberos/protocol ./apacheds/kerberos-codec
>>>> -> /org/apache/directory/server/kerberos/protocol/codec
>>>> -> changed as suggested
>>>> /org/apache/directory/server/kerberos/protocol
>>>> ./apacheds/protocol-kerberos
>>>>
>>>> ------------------------------------------------------------------------------------------------------------------------------
>>>> /org/apache/directory/server/ldap/handlers/extended
>>>> ./apacheds/protocol-ldap
>>>> /org/apache/directory/server/ldap/handlers/extended
>>>> ./apacheds/server-tools ->
>>>> /org/apache/directory/server/ldap/handlers/extended/tools
>>>> -> server-tools project was out of the build. left untouched
>>>>
>>>> --------------------------------------------------------------------------------------------------------------------------------------
>>>> /org/apache/directory/shared/ldap/codec/osgi ./shared/ldap/codec/core
>>>> /org/apache/directory/shared/ldap/codec/osgi
>>>> ./shared/ldap/codec/standalone ->
>>>> /org/apache/directory/shared/ldap/codec/osgi/standalone
>>>> -> was test package, changed as suggested
>>>> /org/apache/directory/shared/ldap/codec/osgi ./shared/ldap/extras/codec
>>>> -> /org/apache/directory/shared/ldap/codec/osgi/extras
>>>> -> was test package, changed as suggested
>>>>
>>>> -----------------------------------------------------------------------------------------------------------------------------------
>>>> /org/apache/directory/shared/ldap/extras/controls/ppolicy
>>>> ./shared/ldap/extras/codec
>>>> /org/apache/directory/shared/ldap/extras/controls/ppolicy
>>>> ./shared/ldap/extras/codec-api ->
>>>> /org/apache/directory/shared/ldap/extras/controls/ppolicy/api
>>>> -> changed as suggested
>>>>
>>>> Regards,
>>>> Gokturk
>>>>
>>>
>>>
>>
> Regards,
> Gokturk
>
Re: [ADS 2.0] OSGi : solving package conflicts
Posted by Göktürk Gezer <go...@gmail.com>.
On Sun, Oct 9, 2011 at 11:55 PM, Stefan Seelmann <se...@apache.org>wrote:
>
>
> On Sun, Oct 9, 2011 at 9:02 PM, Stefan Seelmann <se...@apache.org>wrote:
>
>> On Sat, Oct 8, 2011 at 5:12 PM, Göktürk Gezer <go...@gmail.com>wrote:
>>
>>> Hi,
>>> I attached a patch that solves these package conflicts. But i'm still
>>> unsure about working on trunk.Package renamings are something hard to
>>> describe as diff. Right now, this diff zeroes the old package contents, add
>>> new ones and modify other parts of code to use new packages. i can also
>>> create a script to make your local copy consistent after patch, and then you
>>> can commit like that. So, guide me to the correct way of doing it.
>>>
>>> Here is a change list:
>>>
>>> /org/apache/directory/server ./apacheds/http-directory-bridge
>>> -> changed to /org/apache/directory/server/bridge/http
>>>
>>
>> done
>>
>>
>>> /org/apache/directory/server ./apacheds/service
>>>
>>> /org/apache/directory/server ./apacheds/wrapper ->
>>> /org/apache/directory/server/wrapper
>>> -> changed as suggested
>>>
>>
>> done
>> also changed reference to ApacheDsTanukiWrapper in
>> installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf
>>
>>
>>>
>>> /org/apache/directory/server/config ./apacheds/server-config
>>> /org/apache/directory/server/config ./apacheds/service-builder ->
>>> /org/apache/directory/server/config/builder
>>>
>>
>> done
>>
>> I committed the previous changes. The next changes are a bit more tricky
>> as those guys are also used in Studio.
>>
>>
>>> /org/apache/directory/server/core ./apacheds/core
>>> /org/apache/directory/server/core ./apacheds/core-api ->
>>> /org/apache/directory/server/core/api
>>>
>>
> done
> Made CacheService constructor public. Should this class be moved to
> apacheds-core?
>
i found no beneficial usage for it on apacheds-core-api.
>
>
>> /org/apache/directory/server/core/changelog ./apacheds/core
>>> /org/apache/directory/server/core/changelog ./apacheds/core-api ->
>>> /org/apache/directory/server/core/api/changelog
>>>
>>
> done
>
> /org/apache/directory/server/core/event ./apacheds/core
>>> /org/apache/directory/server/core/event ./apacheds/core-api ->
>>> /org/apache/directory/server/core/api/event
>>>
>>
> done
> Made RegistrationEntry constructor and method public.
>
I was cautios about contructor visibilities, but they're necessary. I hope
they're not meant to be privite.
>
>
>> /org/apache/directory/server/core/interceptor ./apacheds/core
>>> /org/apache/directory/server/core/interceptor ./apacheds/core-api ->
>>> /org/apache/directory/server/core/api/interceptor
>>>
>>
> done, including interceptor.context package
>
>
>> /org/apache/directory/server/core/journal ./apacheds/core
>>>
>> /org/apache/directory/server/core/journal ./apacheds/core-api ->
>>> /org/apache/directory/server/core/api/journal
>>>
>>
> done
>
> /org/apache/directory/server/core/partition ./apacheds/core
>>> /org/apache/directory/server/core/partition ./apacheds/core-api ->
>>> /org/apache/directory/server/core/api/partition
>>>
>> /org/apache/directory/server/core/partition ./apacheds/ldif-partition ->
>>> /org/apache/directory/server/core/partition/impl
>>> -> was test package, changed to
>>> /org/apache/directory/server/core/partition/ldif
>>>
>>
> done, good catch with the test package
>
> /org/apache/directory/server/core/replication ./apacheds/core
>>> /org/apache/directory/server/core/replication ./apacheds/core-api ->
>>> /org/apache/directory/server/core/api/replication
>>>
>>
> Can't find this package, has this been moved before?
>
Yes i guess, i couldn't find it too.
>
> /org/apache/directory/server/core/schema ./apacheds/core
>>> /org/apache/directory/server/core/schema ./apacheds/core-api ->
>>> /org/apache/directory/server/core/api/schema
>>>
>>
> done, but the classes in that package should be reviews and eventually
> moved to apacheds-core
>
> /org/apache/directory/server/core/schema ./apacheds/jdbm-partition ->
>>> /org/apache/directory/server/core/schema/jdbm
>>>
>>
> Moved PartitionSchemaLoaderTest from jdbm-partition to core-integ as
> described in a TODO within that class, removed the package.
>
>
> -> All packages(source and test) under apacheds-api is moved into
>>> org/apache/directory/server/core/api package
>>>
>>
> Do you mean you renamed all packages even those that are not conflicting? I
> didn't renamed those in the first step but I agree that it makes sense to do
> so. However before that we should review if those packages belong to the
> "api" module. The remaining packages are
> - org.apache.directory.server.core.administrative
> - org.apache.directory.server.core.entry
> - org.apache.directory.server.core.filtering
> - org.apache.directory.server.core.invocation
> - org.apache.directory.server.core.schema.registries.synchronizers
>
Yes i renamed all even if they're not conflicting. It seems neater to me.
>
>
>> -> DefaultPartitionNexus class is moved from apacheds-core to
>>> apacheds-core-api to defeat cyclic builds
>>>
>>
> That was not required, there were just unused imports that I deleted.
>
Yeah, that's better. I didn't look closely at how it's used in core-api.
>
>
> When I run the test I saw that LdapConnectionFactory (in
> shared-ldap-client-api) has a method getCoreSessionConnection() the creates
> an instance of LdapCoreSessionConnection via reflection. IMO this should be
> moved to some ApacheDS module.
>
I handled that by just renaming that package name to its new name. This
class is being heavily used by ApacheDS modules for testing, having it in
some ApacheDS module means more.
>
> Committed so far.
>
Thanks.
>
>
>>> --------------------------------------------------------------------------------------------------------------------------
>>> This is not a conflict (test) :
>>> /org/apache/directory/server/kerberos/kdc ./apacheds/kerberos-test
>>> /org/apache/directory/server/kerberos/kdc ./apacheds/protocol-kerberos
>>>
>>> ---------------------------------------------------------------------------------------------------------------------------
>>> /org/apache/directory/server/kerberos/protocol ./apacheds/kerberos-codec
>>> -> /org/apache/directory/server/kerberos/protocol/codec
>>> -> changed as suggested
>>> /org/apache/directory/server/kerberos/protocol
>>> ./apacheds/protocol-kerberos
>>>
>>> ------------------------------------------------------------------------------------------------------------------------------
>>> /org/apache/directory/server/ldap/handlers/extended
>>> ./apacheds/protocol-ldap
>>> /org/apache/directory/server/ldap/handlers/extended
>>> ./apacheds/server-tools ->
>>> /org/apache/directory/server/ldap/handlers/extended/tools
>>> -> server-tools project was out of the build. left untouched
>>>
>>> --------------------------------------------------------------------------------------------------------------------------------------
>>> /org/apache/directory/shared/ldap/codec/osgi ./shared/ldap/codec/core
>>> /org/apache/directory/shared/ldap/codec/osgi
>>> ./shared/ldap/codec/standalone ->
>>> /org/apache/directory/shared/ldap/codec/osgi/standalone
>>> -> was test package, changed as suggested
>>> /org/apache/directory/shared/ldap/codec/osgi ./shared/ldap/extras/codec
>>> -> /org/apache/directory/shared/ldap/codec/osgi/extras
>>> -> was test package, changed as suggested
>>>
>>> -----------------------------------------------------------------------------------------------------------------------------------
>>> /org/apache/directory/shared/ldap/extras/controls/ppolicy
>>> ./shared/ldap/extras/codec
>>> /org/apache/directory/shared/ldap/extras/controls/ppolicy
>>> ./shared/ldap/extras/codec-api ->
>>> /org/apache/directory/shared/ldap/extras/controls/ppolicy/api
>>> -> changed as suggested
>>>
>>> Regards,
>>> Gokturk
>>>
>>
>>
>
Regards,
Gokturk
Re: [ADS 2.0] OSGi : solving package conflicts
Posted by Stefan Seelmann <se...@apache.org>.
On Sun, Oct 9, 2011 at 9:02 PM, Stefan Seelmann <se...@apache.org> wrote:
> On Sat, Oct 8, 2011 at 5:12 PM, Göktürk Gezer <go...@gmail.com>wrote:
>
>> Hi,
>> I attached a patch that solves these package conflicts. But i'm still
>> unsure about working on trunk.Package renamings are something hard to
>> describe as diff. Right now, this diff zeroes the old package contents, add
>> new ones and modify other parts of code to use new packages. i can also
>> create a script to make your local copy consistent after patch, and then you
>> can commit like that. So, guide me to the correct way of doing it.
>>
>> Here is a change list:
>>
>> /org/apache/directory/server ./apacheds/http-directory-bridge
>> -> changed to /org/apache/directory/server/bridge/http
>>
>
> done
>
>
>> /org/apache/directory/server ./apacheds/service
>>
>> /org/apache/directory/server ./apacheds/wrapper ->
>> /org/apache/directory/server/wrapper
>> -> changed as suggested
>>
>
> done
> also changed reference to ApacheDsTanukiWrapper in
> installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf
>
>
>>
>> /org/apache/directory/server/config ./apacheds/server-config
>> /org/apache/directory/server/config ./apacheds/service-builder ->
>> /org/apache/directory/server/config/builder
>>
>
> done
>
> I committed the previous changes. The next changes are a bit more tricky as
> those guys are also used in Studio.
>
>
>> /org/apache/directory/server/core ./apacheds/core
>> /org/apache/directory/server/core ./apacheds/core-api ->
>> /org/apache/directory/server/core/api
>>
>
done
Made CacheService constructor public. Should this class be moved to
apacheds-core?
> /org/apache/directory/server/core/changelog ./apacheds/core
>> /org/apache/directory/server/core/changelog ./apacheds/core-api ->
>> /org/apache/directory/server/core/api/changelog
>>
>
done
/org/apache/directory/server/core/event ./apacheds/core
>> /org/apache/directory/server/core/event ./apacheds/core-api ->
>> /org/apache/directory/server/core/api/event
>>
>
done
Made RegistrationEntry constructor and method public.
> /org/apache/directory/server/core/interceptor ./apacheds/core
>> /org/apache/directory/server/core/interceptor ./apacheds/core-api ->
>> /org/apache/directory/server/core/api/interceptor
>>
>
done, including interceptor.context package
> /org/apache/directory/server/core/journal ./apacheds/core
>>
> /org/apache/directory/server/core/journal ./apacheds/core-api ->
>> /org/apache/directory/server/core/api/journal
>>
>
done
/org/apache/directory/server/core/partition ./apacheds/core
>> /org/apache/directory/server/core/partition ./apacheds/core-api ->
>> /org/apache/directory/server/core/api/partition
>>
> /org/apache/directory/server/core/partition ./apacheds/ldif-partition ->
>> /org/apache/directory/server/core/partition/impl
>> -> was test package, changed to
>> /org/apache/directory/server/core/partition/ldif
>>
>
done, good catch with the test package
/org/apache/directory/server/core/replication ./apacheds/core
>> /org/apache/directory/server/core/replication ./apacheds/core-api ->
>> /org/apache/directory/server/core/api/replication
>>
>
Can't find this package, has this been moved before?
/org/apache/directory/server/core/schema ./apacheds/core
>> /org/apache/directory/server/core/schema ./apacheds/core-api ->
>> /org/apache/directory/server/core/api/schema
>>
>
done, but the classes in that package should be reviews and eventually moved
to apacheds-core
/org/apache/directory/server/core/schema ./apacheds/jdbm-partition ->
>> /org/apache/directory/server/core/schema/jdbm
>>
>
Moved PartitionSchemaLoaderTest from jdbm-partition to core-integ as
described in a TODO within that class, removed the package.
-> All packages(source and test) under apacheds-api is moved into
>> org/apache/directory/server/core/api package
>>
>
Do you mean you renamed all packages even those that are not conflicting? I
didn't renamed those in the first step but I agree that it makes sense to do
so. However before that we should review if those packages belong to the
"api" module. The remaining packages are
- org.apache.directory.server.core.administrative
- org.apache.directory.server.core.entry
- org.apache.directory.server.core.filtering
- org.apache.directory.server.core.invocation
- org.apache.directory.server.core.schema.registries.synchronizers
> -> DefaultPartitionNexus class is moved from apacheds-core to
>> apacheds-core-api to defeat cyclic builds
>>
>
That was not required, there were just unused imports that I deleted.
When I run the test I saw that LdapConnectionFactory (in
shared-ldap-client-api) has a method getCoreSessionConnection() the creates
an instance of LdapCoreSessionConnection via reflection. IMO this should be
moved to some ApacheDS module.
Committed so far.
>> --------------------------------------------------------------------------------------------------------------------------
>> This is not a conflict (test) :
>> /org/apache/directory/server/kerberos/kdc ./apacheds/kerberos-test
>> /org/apache/directory/server/kerberos/kdc ./apacheds/protocol-kerberos
>>
>> ---------------------------------------------------------------------------------------------------------------------------
>> /org/apache/directory/server/kerberos/protocol ./apacheds/kerberos-codec
>> -> /org/apache/directory/server/kerberos/protocol/codec
>> -> changed as suggested
>> /org/apache/directory/server/kerberos/protocol
>> ./apacheds/protocol-kerberos
>>
>> ------------------------------------------------------------------------------------------------------------------------------
>> /org/apache/directory/server/ldap/handlers/extended
>> ./apacheds/protocol-ldap
>> /org/apache/directory/server/ldap/handlers/extended
>> ./apacheds/server-tools ->
>> /org/apache/directory/server/ldap/handlers/extended/tools
>> -> server-tools project was out of the build. left untouched
>>
>> --------------------------------------------------------------------------------------------------------------------------------------
>> /org/apache/directory/shared/ldap/codec/osgi ./shared/ldap/codec/core
>> /org/apache/directory/shared/ldap/codec/osgi
>> ./shared/ldap/codec/standalone ->
>> /org/apache/directory/shared/ldap/codec/osgi/standalone
>> -> was test package, changed as suggested
>> /org/apache/directory/shared/ldap/codec/osgi ./shared/ldap/extras/codec ->
>> /org/apache/directory/shared/ldap/codec/osgi/extras
>> -> was test package, changed as suggested
>>
>> -----------------------------------------------------------------------------------------------------------------------------------
>> /org/apache/directory/shared/ldap/extras/controls/ppolicy
>> ./shared/ldap/extras/codec
>> /org/apache/directory/shared/ldap/extras/controls/ppolicy
>> ./shared/ldap/extras/codec-api ->
>> /org/apache/directory/shared/ldap/extras/controls/ppolicy/api
>> -> changed as suggested
>>
>> Regards,
>> Gokturk
>>
>
>
Re: [ADS 2.0] OSGi : solving package conflicts
Posted by Stefan Seelmann <se...@apache.org>.
On Sat, Oct 8, 2011 at 5:12 PM, Göktürk Gezer <go...@gmail.com>wrote:
> Hi,
> I attached a patch that solves these package conflicts. But i'm still
> unsure about working on trunk.Package renamings are something hard to
> describe as diff. Right now, this diff zeroes the old package contents, add
> new ones and modify other parts of code to use new packages. i can also
> create a script to make your local copy consistent after patch, and then you
> can commit like that. So, guide me to the correct way of doing it.
>
> Here is a change list:
>
> /org/apache/directory/server ./apacheds/http-directory-bridge
> -> changed to /org/apache/directory/server/bridge/http
>
done
> /org/apache/directory/server ./apacheds/service
>
> /org/apache/directory/server ./apacheds/wrapper ->
> /org/apache/directory/server/wrapper
> -> changed as suggested
>
done
also changed reference to ApacheDsTanukiWrapper in
installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf
>
> /org/apache/directory/server/config ./apacheds/server-config
> /org/apache/directory/server/config ./apacheds/service-builder ->
> /org/apache/directory/server/config/builder
>
done
I committed the previous changes. The next changes are a bit more tricky as
those guys are also used in Studio.
> /org/apache/directory/server/core ./apacheds/core
> /org/apache/directory/server/core ./apacheds/core-api ->
> /org/apache/directory/server/core/api
>
> /org/apache/directory/server/core/changelog ./apacheds/core
> /org/apache/directory/server/core/changelog ./apacheds/core-api ->
> /org/apache/directory/server/core/api/changelog
>
> /org/apache/directory/server/core/event ./apacheds/core
> /org/apache/directory/server/core/event ./apacheds/core-api ->
> /org/apache/directory/server/core/api/event
>
> /org/apache/directory/server/core/interceptor ./apacheds/core
> /org/apache/directory/server/core/interceptor ./apacheds/core-api ->
> /org/apache/directory/server/core/api/interceptor
>
> /org/apache/directory/server/core/journal ./apacheds/core
> /org/apache/directory/server/core/journal ./apacheds/core-api ->
> /org/apache/directory/server/core/api/journal
>
> /org/apache/directory/server/core/partition ./apacheds/core
> /org/apache/directory/server/core/partition ./apacheds/core-api ->
> /org/apache/directory/server/core/api/partition
> /org/apache/directory/server/core/partition ./apacheds/ldif-partition ->
> /org/apache/directory/server/core/partition/impl
> -> was test package, changed to
> /org/apache/directory/server/core/partition/ldif
>
> /org/apache/directory/server/core/replication ./apacheds/core
> /org/apache/directory/server/core/replication ./apacheds/core-api ->
> /org/apache/directory/server/core/api/replication
>
> /org/apache/directory/server/core/schema ./apacheds/core
> /org/apache/directory/server/core/schema ./apacheds/core-api ->
> /org/apache/directory/server/core/api/schema
> /org/apache/directory/server/core/schema ./apacheds/jdbm-partition ->
> /org/apache/directory/server/core/schema/jdbm
> -> was test package, changed as suggested.
>
>
> -> All packages(source and test) under apacheds-api is moved into
> org/apache/directory/server/core/api package
> -> DefaultPartitionNexus class is moved from apacheds-core to
> apacheds-core-api to defeat cyclic builds
>
>
> --------------------------------------------------------------------------------------------------------------------------
> This is not a conflict (test) :
> /org/apache/directory/server/kerberos/kdc ./apacheds/kerberos-test
> /org/apache/directory/server/kerberos/kdc ./apacheds/protocol-kerberos
>
> ---------------------------------------------------------------------------------------------------------------------------
> /org/apache/directory/server/kerberos/protocol ./apacheds/kerberos-codec ->
> /org/apache/directory/server/kerberos/protocol/codec
> -> changed as suggested
> /org/apache/directory/server/kerberos/protocol ./apacheds/protocol-kerberos
>
> ------------------------------------------------------------------------------------------------------------------------------
> /org/apache/directory/server/ldap/handlers/extended
> ./apacheds/protocol-ldap
> /org/apache/directory/server/ldap/handlers/extended ./apacheds/server-tools
> -> /org/apache/directory/server/ldap/handlers/extended/tools
> -> server-tools project was out of the build. left untouched
>
> --------------------------------------------------------------------------------------------------------------------------------------
> /org/apache/directory/shared/ldap/codec/osgi ./shared/ldap/codec/core
> /org/apache/directory/shared/ldap/codec/osgi ./shared/ldap/codec/standalone
> -> /org/apache/directory/shared/ldap/codec/osgi/standalone
> -> was test package, changed as suggested
> /org/apache/directory/shared/ldap/codec/osgi ./shared/ldap/extras/codec ->
> /org/apache/directory/shared/ldap/codec/osgi/extras
> -> was test package, changed as suggested
>
> -----------------------------------------------------------------------------------------------------------------------------------
> /org/apache/directory/shared/ldap/extras/controls/ppolicy
> ./shared/ldap/extras/codec
> /org/apache/directory/shared/ldap/extras/controls/ppolicy
> ./shared/ldap/extras/codec-api ->
> /org/apache/directory/shared/ldap/extras/controls/ppolicy/api
> -> changed as suggested
>
> Regards,
> Gokturk
>
Re: [ADS 2.0] OSGi : solving package conflicts
Posted by Göktürk Gezer <go...@gmail.com>.
Hi,
I attached a patch that solves these package conflicts. But i'm still unsure
about working on trunk.Package renamings are something hard to describe as
diff. Right now, this diff zeroes the old package contents, add new ones and
modify other parts of code to use new packages. i can also create a script
to make your local copy consistent after patch, and then you can commit like
that. So, guide me to the correct way of doing it.
Here is a change list:
/org/apache/directory/server ./apacheds/http-directory-bridge
-> changed to /org/apache/directory/server/bridge/http
/org/apache/directory/server ./apacheds/service
/org/apache/directory/server ./apacheds/wrapper ->
/org/apache/directory/server/wrapper
-> changed as suggested
------------------------------------------------------------------------------------------------------------------------
/org/apache/directory/server/config ./apacheds/server-config
/org/apache/directory/server/config ./apacheds/service-builder ->
/org/apache/directory/server/config/builder
/org/apache/directory/server/core ./apacheds/core
/org/apache/directory/server/core ./apacheds/core-api ->
/org/apache/directory/server/core/api
/org/apache/directory/server/core/changelog ./apacheds/core
/org/apache/directory/server/core/changelog ./apacheds/core-api ->
/org/apache/directory/server/core/api/changelog
/org/apache/directory/server/core/event ./apacheds/core
/org/apache/directory/server/core/event ./apacheds/core-api ->
/org/apache/directory/server/core/api/event
/org/apache/directory/server/core/interceptor ./apacheds/core
/org/apache/directory/server/core/interceptor ./apacheds/core-api ->
/org/apache/directory/server/core/api/interceptor
/org/apache/directory/server/core/journal ./apacheds/core
/org/apache/directory/server/core/journal ./apacheds/core-api ->
/org/apache/directory/server/core/api/journal
/org/apache/directory/server/core/partition ./apacheds/core
/org/apache/directory/server/core/partition ./apacheds/core-api ->
/org/apache/directory/server/core/api/partition
/org/apache/directory/server/core/partition ./apacheds/ldif-partition ->
/org/apache/directory/server/core/partition/impl
-> was test package, changed to
/org/apache/directory/server/core/partition/ldif
/org/apache/directory/server/core/replication ./apacheds/core
/org/apache/directory/server/core/replication ./apacheds/core-api ->
/org/apache/directory/server/core/api/replication
/org/apache/directory/server/core/schema ./apacheds/core
/org/apache/directory/server/core/schema ./apacheds/core-api ->
/org/apache/directory/server/core/api/schema
/org/apache/directory/server/core/schema ./apacheds/jdbm-partition ->
/org/apache/directory/server/core/schema/jdbm
-> was test package, changed as suggested.
-> All packages(source and test) under apacheds-api is moved into
org/apache/directory/server/core/api package
-> DefaultPartitionNexus class is moved from apacheds-core to
apacheds-core-api to defeat cyclic builds
--------------------------------------------------------------------------------------------------------------------------
This is not a conflict (test) :
/org/apache/directory/server/kerberos/kdc ./apacheds/kerberos-test
/org/apache/directory/server/kerberos/kdc ./apacheds/protocol-kerberos
---------------------------------------------------------------------------------------------------------------------------
/org/apache/directory/server/kerberos/protocol ./apacheds/kerberos-codec ->
/org/apache/directory/server/kerberos/protocol/codec
-> changed as suggested
/org/apache/directory/server/kerberos/protocol ./apacheds/protocol-kerberos
------------------------------------------------------------------------------------------------------------------------------
/org/apache/directory/server/ldap/handlers/extended ./apacheds/protocol-ldap
/org/apache/directory/server/ldap/handlers/extended ./apacheds/server-tools
-> /org/apache/directory/server/ldap/handlers/extended/tools
-> server-tools project was out of the build. left untouched
--------------------------------------------------------------------------------------------------------------------------------------
/org/apache/directory/shared/ldap/codec/osgi ./shared/ldap/codec/core
/org/apache/directory/shared/ldap/codec/osgi ./shared/ldap/codec/standalone
-> /org/apache/directory/shared/ldap/codec/osgi/standalone
-> was test package, changed as suggested
/org/apache/directory/shared/ldap/codec/osgi ./shared/ldap/extras/codec ->
/org/apache/directory/shared/ldap/codec/osgi/extras
-> was test package, changed as suggested
-----------------------------------------------------------------------------------------------------------------------------------
/org/apache/directory/shared/ldap/extras/controls/ppolicy
./shared/ldap/extras/codec
/org/apache/directory/shared/ldap/extras/controls/ppolicy
./shared/ldap/extras/codec-api ->
/org/apache/directory/shared/ldap/extras/controls/ppolicy/api
-> changed as suggested
Regards,
Gokturk