directory-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Seelmann <seelm...@apache.org>
Subject Re: [ADS 2.0] OSGi : solving package conflicts
Date Sun, 09 Oct 2011 19:02:00 GMT
On Sat, Oct 8, 2011 at 5:12 PM, Göktürk Gezer <gokturk.gezer@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
>

Mime
View raw message