[ApacheDS] [SASL] SASL branch merge plan

[Enrique Rodriguez <en...@gmail.com>]

Hi, Directory developers,

I have the latest code from trunk (which now includes the former
'kerberos-encryption-types' branch) merged into
'apacheds-sasl-branch'.  After correcting some basic conflicts and
resolving some compilation failures due to the new encryption types, I
now have the SASL branch building.  I had to make a change to the SASL
GSSAPI test due to the encryption types and now the integration tests
in server-unit pass.  Once the entire branch completes a -Dintegration
build I'll commit the SASL branch and then hold it open for a final
review before a merge to trunk.

So, if the timing is good for everyone, I will:

1)  Commit the feature branch maintenance merge to
'apacheds-sasl-branch' once the integration tests complete (~8pm EST).
 I'd like you guys to look over ServerContextFactory in particular.
There were some changes (by Emm, I believe) and the new configuration
so SCF was a bit of a hot-spot for conflicts.

2)  Merge one last time so 'apacheds-sasl-branch' is identical to
trunk.  There were some minor updates in the last day or so.

3)  Perform the final merge of everything back to trunk tonight.

Enrique

Re: [ApacheDS] [SASL] SASL branch merge plan

[Enrique Rodriguez <en...@gmail.com>]

On 5/23/07, Alex Karasulu <ak...@apache.org> wrote:
> You want to replace the present trunk with the SASL branch?

I just did one more maintenance merge, so once integration tests
complete, yes, I would like to replace the current trunk with the
current SASL branch to close out the SASL branch.

Enrique

Re: [ApacheDS] [SASL] SASL branch merge plan

[Alex Karasulu <ak...@apache.org>]

You want to replace the present trunk with the SASL branch?

On 5/23/07, Enrique Rodriguez <en...@gmail.com> wrote:
>
> On 5/23/07, Enrique Rodriguez <en...@gmail.com> wrote:
> > ...
> > 1)  Commit the feature branch maintenance merge to
> > 'apacheds-sasl-branch' once the integration tests complete (~8pm EST).
> >  I'd like you guys to look over ServerContextFactory in particular.
> > There were some changes (by Emm, I believe) and the new configuration
> > so SCF was a bit of a hot-spot for conflicts.
>
> I completed the maintenance merge to the SASL branch, did fresh
> check-outs, and ran all the tests again.  The SASL branch can now be
> considered the proposed new trunk.
>
> Maybe you could review at least ServerContextFactory.  There were some
> changes to set the available processors, fix a bug in LDIF loading,
> and then the new config that came with SASL, causing the most
> conflicts.
>
>
> http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java?limit_changes=0&view=markup&pathrev=541123
>
> Enrique
>
> > 2)  Merge one last time so 'apacheds-sasl-branch' is identical to
> > trunk.  There were some minor updates in the last day or so.
> >
> > 3)  Perform the final merge of everything back to trunk tonight.
> >
> > Enrique
> >
>

Re: [ApacheDS] [SASL] SASL branch merge plan

[Enrique Rodriguez <en...@gmail.com>]

On 5/23/07, Enrique Rodriguez <en...@gmail.com> wrote:
> ...
> 1)  Commit the feature branch maintenance merge to
> 'apacheds-sasl-branch' once the integration tests complete (~8pm EST).
>  I'd like you guys to look over ServerContextFactory in particular.
> There were some changes (by Emm, I believe) and the new configuration
> so SCF was a bit of a hot-spot for conflicts.

I completed the maintenance merge to the SASL branch, did fresh
check-outs, and ran all the tests again.  The SASL branch can now be
considered the proposed new trunk.

Maybe you could review at least ServerContextFactory.  There were some
changes to set the available processors, fix a bug in LDIF loading,
and then the new config that came with SASL, causing the most
conflicts.

http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java?limit_changes=0&view=markup&pathrev=541123

Enrique

> 2)  Merge one last time so 'apacheds-sasl-branch' is identical to
> trunk.  There were some minor updates in the last day or so.
>
> 3)  Perform the final merge of everything back to trunk tonight.
>
> Enrique
>

Re: [Docs] Related to 1.5 (was Re: [ApacheDS] [SASL] SASL branch merge plan)

[Enrique Rodriguez <en...@gmail.com>]

On 5/25/07, Christine Koppelt <ch...@googlemail.com> wrote:
> ...
> contents have been copied

I see.  I took out the warnings that stated development was ongoing in
the SASL branch.

> I have started a reference page for the configuration parameters in
> server.xml (http://directory.apache.org/apacheds/1.5/configuration-parameters-reference.html).
> Perhaps we can remove the tables from the protocol provider pages and
> give them a more tutorial like style. WDYT?

That makes sense to move the tables to a reference section, once there
are tutorials.

Enrique

Re: [Docs] Related to 1.5 (was Re: [ApacheDS] [SASL] SASL branch merge plan)

[Christine Koppelt <ch...@googlemail.com>]

Hi Enrique,

contents have been copied

I have started a reference page for the configuration parameters in
server.xml (http://directory.apache.org/apacheds/1.5/configuration-parameters-reference.html).
Perhaps we can remove the tables from the protocol provider pages and
give them a more tutorial like style. WDYT?

Christine



2007/5/25, Enrique Rodriguez <en...@gmail.com>:
> On 5/25/07, Stefan Zoerner <st...@labeo.de> wrote:
> > ...
> > I have talked to Christine yesterday, and we plan to copy the content
> > from both the BUG and AUG to the 1.5 space as a starting point for the
> > 1.5 documentation. I have already started with the BUG. Christine has
> > volunteered for the AUG.
>
> Great news!  I'm glad to hear things are in motion.  We will likely
> have a lot of questions on using and configuring SASL authentication,
> as it is certainly more complicated than simple binds.
>
> Once the pages are in place I can help take out some of the "this is
> in a branch" warnings and also I think I have some more doco on
> setting up SASL on ApacheDS and then how to use some of the common
> clients.
>
> Enrique
>

Re: [Docs] Related to 1.5 (was Re: [ApacheDS] [SASL] SASL branch merge plan)

[Enrique Rodriguez <en...@gmail.com>]

On 5/25/07, Stefan Zoerner <st...@labeo.de> wrote:
> ...
> I have talked to Christine yesterday, and we plan to copy the content
> from both the BUG and AUG to the 1.5 space as a starting point for the
> 1.5 documentation. I have already started with the BUG. Christine has
> volunteered for the AUG.

Great news!  I'm glad to hear things are in motion.  We will likely
have a lot of questions on using and configuring SASL authentication,
as it is certainly more complicated than simple binds.

Once the pages are in place I can help take out some of the "this is
in a branch" warnings and also I think I have some more doco on
setting up SASL on ApacheDS and then how to use some of the common
clients.

Enrique

[Docs] Related to 1.5 (was Re: [ApacheDS] [SASL] SASL branch merge plan)

[Stefan Zoerner <st...@labeo.de>]

Enrique Rodriguez wrote:

> Ideally, the responsible party(ies) would correct this by declaring
> the home for 1.5.1 docs and moving them there.  If they aren't going
> to correct this, then I just need to know the 1.5.1 home and I can
> help sort this out.  I am here to help, but changes need to be
> discussed on this list.

I have talked to Christine yesterday, and we plan to copy the content 
from both the BUG and AUG to the 1.5 space as a starting point for the 
1.5 documentation. I have already started with the BUG. Christine has 
volunteered for the AUG.

Content related to 1.5 only will be removed from the 1.0 space; it 
simply (as Enrique correctly pointed out) does not belong there. Sorry 
for any inconvenience.

> I'm guessng the home would be DIRxSRVx11, despite the space having
> "11" in the name.  Is DIRxSRVx11 the right home for the SASL and
> Configuration docs?  Who is going to un-merge the docs from the 1.0
> AUG?

Unfortunately yes. I do not know, whether it is possible to rename the 
space. But from the "outside", the wrong name is not visible in the URLs.

http://directory.apache.org/apacheds/1.5/

It is therefor not that important.

Greetings from sunny Lake Constance,
     Stefan

Re: [ApacheDS] [SASL] SASL branch merge plan

[Enrique Rodriguez <en...@gmail.com>]

On 5/24/07, Emmanuel Lecharny <el...@apache.org> wrote:
> Enrique Rodriguez a écrit :
> > The configuration is already documented.
>
> Ho, sorry, missed it !
>
> Just looking at the AUG, this is a great doco ! You should have sent me
> a RTFM ;)

I did a pile of work for SASL and configuration changes, but, as noted
in at least 2 threads now, my documentation was merged into the 1.0
AUG without any notification to the list.  I believe this is in error,
since both the SASL and configuration changes will first appear in
1.5.1, as noted in the trunk POM's and in the relevant JIRA issues.

Ideally, the responsible party(ies) would correct this by declaring
the home for 1.5.1 docs and moving them there.  If they aren't going
to correct this, then I just need to know the 1.5.1 home and I can
help sort this out.  I am here to help, but changes need to be
discussed on this list.

I'm guessng the home would be DIRxSRVx11, despite the space having
"11" in the name.  Is DIRxSRVx11 the right home for the SASL and
Configuration docs?  Who is going to un-merge the docs from the 1.0
AUG?

> Btw, what about using LdapStudio snapshot instead of JExplorer ? Ok, let
> somebody else do that, so that we can experiment and give you some
> feedback about the doco.

Yeah that was an old snapshot, I think from JXplorer for the 2005 OSGi
World Congress (Paris, BTW).

Enrique

Re: [ApacheDS] [SASL] SASL branch merge plan

[Emmanuel Lecharny <el...@apache.org>]

Enrique Rodriguez a écrit :

> On 5/24/07, Emmanuel Lecharny <el...@apache.org> wrote:
>
>> ...
>> Can you set them to "disabled" by default, and add a page on confluence
>> explaining how to enable each service ?
>
>
> That is exactly what I did in my commit.  They are both disabled by
> default in the Configuration classes and now also set disabled in the
> server.xml.  The "enabled=true" in the server.xml was overriding their
> disabled-by-default state.
>
> The configuration is already documented.

Ho, sorry, missed it !

Just looking at the AUG, this is a great doco ! You should have sent me 
a RTFM ;)

Btw, what about using LdapStudio snapshot instead of JExplorer ? Ok, let 
somebody else do that, so that we can experiment and give you some 
feedback about the doco.

Thanks Enrique !

Re: [ApacheDS] [SASL] SASL branch merge plan

[Emmanuel Lecharny <el...@apache.org>]

Enrique Rodriguez a écrit :

> On 5/24/07, Emmanuel Lecharny <el...@apache.org> wrote:
>
>> ...
>> Can you set them to "disabled" by default, and add a page on confluence
>> explaining how to enable each service ?
>
>
> That is exactly what I did in my commit.  They are both disabled by
> default in the Configuration classes and now also set disabled in the
> server.xml.  The "enabled=true" in the server.xml was overriding their
> disabled-by-default state.


Oops, I send my mail before realising that it was already done !

Sorry Enrique, my bad :(

>> Have you contacted Christine or Stefan Szoerner about documentation ?
>
>
> Yes.  The pages which were erroneously moved to the 1.0 AUG need to
> move to a place for 1.5.1, since these changes are both in the code
> and JIRA for 1.5.1.

ok, great !

Thanks a lot !

Emmanuel

Re: [ApacheDS] [SASL] SASL branch merge plan

[Enrique Rodriguez <en...@gmail.com>]

On 5/24/07, Emmanuel Lecharny <el...@apache.org> wrote:
> ...
> Can you set them to "disabled" by default, and add a page on confluence
> explaining how to enable each service ?

That is exactly what I did in my commit.  They are both disabled by
default in the Configuration classes and now also set disabled in the
server.xml.  The "enabled=true" in the server.xml was overriding their
disabled-by-default state.

The configuration is already documented.

> Have you contacted Christine or Stefan Szoerner about documentation ?

Yes.  The pages which were erroneously moved to the 1.0 AUG need to
move to a place for 1.5.1, since these changes are both in the code
and JIRA for 1.5.1.

Enrique

Re: [ApacheDS] [SASL] SASL branch merge plan

[Emmanuel Lecharny <el...@apache.org>]

Enrique Rodriguez a écrit :

> On 5/23/07, Emmanuel Lecharny <el...@apache.org> wrote:
>
>> ...
>> I'm currently fixing the server.xml by using port above 1024, because I
>> need to do some ldap tests, but it's just a quick fix.
>>
>> I think all those services (kerberos, NTP, DNS etc) should be commented
>> by default in this file. It will be up to the user to uncomment them
>> dependending on his need.
>>
>> Can you commit a new server.xml so that it can be launched with only 
>> LDAP ?
>
>
> Good point.  I setup the server.xml to demo the new config
> possibilities for reviewers of the branch.  I committed the disabling
> of every protocol but LDAP.  The protocols all have a property called
> "enabled" that can be set to "false."
>
> Enrique
>
Can you set them to "disabled" by default, and add a page on confluence 
explaining how to enable each service ?

At some point, we will just drop the server.xml file to embed all the 
conf into ADS itself, so this page will be the seed for the next 
configuration Help (we will use LdapStudio for that)

Have you contacted Christine or Stefan Szoerner about documentation ?

Thanks !

Re: [ApacheDS] [SASL] SASL branch merge plan

[Enrique Rodriguez <en...@gmail.com>]

On 5/23/07, Emmanuel Lecharny <el...@apache.org> wrote:
> ...
> I'm currently fixing the server.xml by using port above 1024, because I
> need to do some ldap tests, but it's just a quick fix.
>
> I think all those services (kerberos, NTP, DNS etc) should be commented
> by default in this file. It will be up to the user to uncomment them
> dependending on his need.
>
> Can you commit a new server.xml so that it can be launched with only LDAP ?

Good point.  I setup the server.xml to demo the new config
possibilities for reviewers of the branch.  I committed the disabling
of every protocol but LDAP.  The protocols all have a property called
"enabled" that can be set to "false."

Enrique

Re: [ApacheDS] [SASL] SASL branch merge plan

[Emmanuel Lecharny <el...@apache.org>]

Hi Enrique,

as I just woke up a few minutes ago, the second I did this morning (I 
won't tell you what was the first thing :) was to svn up the trunks and 
launch the server. Now, I have a pb : all those declared port in 
server.xml forbid me to launch it, because I'm not root on it 
(obvisouly, 88, 123, 464, ... are below 1024 ...)

I'm currently fixing the server.xml by using port above 1024, because I 
need to do some ldap tests, but it's just a quick fix.

I think all those services (kerberos, NTP, DNS etc) should be commented 
by default in this file. It will be up to the user to uncomment them 
dependending on his need.

Can you commit a new server.xml so that it can be launched with only LDAP ?

thanks !

btw, congrat for the good work ! SASL was expected since so long ...

Emmanuel

Enrique Rodriguez a écrit :

> On 5/23/07, Enrique Rodriguez <en...@gmail.com> wrote:
>
>> ...
>> 3)  Perform the final merge of everything back to trunk tonight.
>
>
> OK, in case you're not on the commits list, I merged the SASL branch
> back into the trunk:
>
> http://svn.apache.org/viewvc?view=rev&rev=541149
>
> Time for some new threads on what I busted ...
>
> Enrique
>

Re: [ApacheDS] [SASL] SASL branch merge plan

[Enrique Rodriguez <en...@gmail.com>]

On 5/23/07, Enrique Rodriguez <en...@gmail.com> wrote:
> ...
> 3)  Perform the final merge of everything back to trunk tonight.

OK, in case you're not on the commits list, I merged the SASL branch
back into the trunk:

http://svn.apache.org/viewvc?view=rev&rev=541149

Time for some new threads on what I busted ...

Enrique