You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by Mark Thomas <ma...@apache.org> on 2007/10/05 03:45:57 UTC
Time to organise svn
In light of the recent vote, we need to make some changes to svn. In
short we need to add:
6.2.x
trunk
There are a number of ways we could do this. I suggest:
svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x
https://svn.apache.org/repos/asf/tomcat/tc6.2.x
svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
https://svn.apache.org/repos/asf/tomcat/trunk
There will then need to be various fixes to version numbers etc.
Alternative suggestions welcome. I'd like to do this Monday next week,
probably around 17.00 GMT.
Also, please add your thoughts / comments to
http://wiki.apache.org/tomcat/TomcatVersions on what we should do with
the numerous versions we are currently supporting in one form or another.
Cheers,
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by jean-frederic clere <jf...@gmail.com>.
William A. Rowe, Jr. wrote:
> Mark Thomas wrote:
>> William A. Rowe, Jr. wrote:
>>> Actually, the way it typically works at httpd-space (which your new
>>> policy is based on) is that you would next create 6.1.0 as a forever
>>> development branch. Committers apply each patch they believe belongs
>>> to the 6.2.0 release, and things are removed and readded as various
>>> votes and discussions proceed.
>> OK. I think I have it now. Does the the following make more sense?
>>
>> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
>> https://svn.apache.org/repos/asf/tomcat/tc6.1.x/trunk
>>
>> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
>> https://svn.apache.org/repos/asf/tomcat/trunk
>>
>> and then
>> - Make all changes in trunk (CTR)
>> - Port those API changes we want in 6.2.x from trunk to 6.1.x (RTC)
>> - A beta release of 6.1.x
>> - Once we are happy with 6.1.x, freeze it, create 6.2.x and do a
>> stable release
>> - Continue to port non-API modifying changes from trunk to 6.2.x as RTC
>> - At some point in the future, trunk is branched to form 6.3.x which
>> is used as the basis for 6.4.x or 7.0.x
>
> Yup, my only kibitz would be that you /might/ want to consider deferring
> the creation of trunk for a week to copy it from 6.1.x. in order to let
> people catch up with the backlog of patches, without having to apply them
> in /both/ places at once :)
The best is to start from a tagged version of tc-6.0.x.
Cheers
Jean-Frederic
>
> Bill
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Mark Thomas wrote:
> William A. Rowe, Jr. wrote:
>> Actually, the way it typically works at httpd-space (which your new
>> policy is based on) is that you would next create 6.1.0 as a forever
>> development branch. Committers apply each patch they believe belongs
>> to the 6.2.0 release, and things are removed and readded as various
>> votes and discussions proceed.
>
> OK. I think I have it now. Does the the following make more sense?
>
> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
> https://svn.apache.org/repos/asf/tomcat/tc6.1.x/trunk
>
> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
> https://svn.apache.org/repos/asf/tomcat/trunk
>
> and then
> - Make all changes in trunk (CTR)
> - Port those API changes we want in 6.2.x from trunk to 6.1.x (RTC)
> - A beta release of 6.1.x
> - Once we are happy with 6.1.x, freeze it, create 6.2.x and do a
> stable release
> - Continue to port non-API modifying changes from trunk to 6.2.x as RTC
> - At some point in the future, trunk is branched to form 6.3.x which
> is used as the basis for 6.4.x or 7.0.x
Yup, my only kibitz would be that you /might/ want to consider deferring
the creation of trunk for a week to copy it from 6.1.x. in order to let
people catch up with the backlog of patches, without having to apply them
in /both/ places at once :)
Bill
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by Peter Rossbach <pr...@objektpark.de>.
++1
Am 05.10.2007 um 14:07 schrieb Remy Maucherat:
> Mark Thomas wrote:
>> Next attempt.
>> Taking account of the comments so far, a slightly modified
>> proposal is
>> below.
>> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
>> https://svn.apache.org/repos/asf/tomcat/trunk
>> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/
>> TOMCAT_6_0_14
>> https://svn.apache.org/repos/asf/tomcat/tc6.1.0/trunk
>
> Instead, I would propose to tag a new 6.0.15 candidate first.
>
> Rémy
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by Jim Jagielski <ji...@jaguNET.com>.
On Oct 5, 2007, at 8:07 AM, Remy Maucherat wrote:
> Mark Thomas wrote:
>> Next attempt.
>> Taking account of the comments so far, a slightly modified
>> proposal is
>> below.
>> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
>> https://svn.apache.org/repos/asf/tomcat/trunk
>> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/
>> TOMCAT_6_0_14
>> https://svn.apache.org/repos/asf/tomcat/tc6.1.0/trunk
>
> Instead, I would propose to tag a new 6.0.15 candidate first.
>
+1
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by Peter Rossbach <pr...@objektpark.de>.
HI,
what I miss is the bundle of the following include
<xsd:include schemaLocation="javaee_5.xsd" />
The file is reference at web-jsptaglibrary_2_1.xsd and web-app_2_5.xsd.
Can it be that schemaResolver at o.a.c.startup.DigesterFactory must
be also registered all
included xml schemas for standalone resolving?
Original schema files at http://java.sun.com/xml/ns/javaee has the
CDDL lisence and
we must bundle the glassfish/bootstrap/legal/LICENSE.txt and must be
reference it at the NOTICE file.
regards
Peter
Am 06.10.2007 um 22:08 schrieb Mark Thomas:
> Remy Maucherat wrote:
>> Mark Thomas wrote:
>>> Next attempt.
>>>
>>> Taking account of the comments so far, a slightly modified
>>> proposal is
>>> below.
>>>
>>> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
>>> https://svn.apache.org/repos/asf/tomcat/trunk
>>>
>>> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/
>>> TOMCAT_6_0_14
>>> https://svn.apache.org/repos/asf/tomcat/tc6.1.0/trunk
>>
>> Instead, I would propose to tag a new 6.0.15 candidate first.
>
> Remy,
>
> Please can you fix the following files that are not currently AL2
> licenced before the tag.
>
> http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/java/javax/
> servlet/jsp/resources/jsp_2_1.xsd
> http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/java/javax/
> servlet/jsp/resources/web-jsptaglibrary_2_1.xsd
>
> These originated with this commit:
> http://svn.apache.org/viewvc?view=rev&revision=481296
>
> If the source was such that the Sun license can be removed and an AL2
> one inserted, great. If not, we can use the CDDL ones.
>
> Cheers,
>
> Mark
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by Mark Thomas <ma...@apache.org>.
Remy Maucherat wrote:
> Mark Thomas wrote:
>> Next attempt.
>>
>> Taking account of the comments so far, a slightly modified proposal is
>> below.
>>
>> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
>> https://svn.apache.org/repos/asf/tomcat/trunk
>>
>> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_14
>> https://svn.apache.org/repos/asf/tomcat/tc6.1.0/trunk
>
> Instead, I would propose to tag a new 6.0.15 candidate first.
Remy,
Please can you fix the following files that are not currently AL2
licenced before the tag.
http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jsp_2_1.xsd
http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd
These originated with this commit:
http://svn.apache.org/viewvc?view=rev&revision=481296
If the source was such that the Sun license can be removed and an AL2
one inserted, great. If not, we can use the CDDL ones.
Cheers,
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by Filip Hanik - Dev Lists <de...@hanik.com>.
jean-frederic clere wrote:
> Filip Hanik - Dev Lists wrote:
>
>> jean-frederic clere wrote:
>>
>>> Filip Hanik - Dev Lists wrote:
>>>
>>>
>>>> Remy Maucherat wrote:
>>>>
>>>>
>>>>> jean-frederic clere wrote:
>>>>>
>>>>>
>>>>>> Remy Maucherat wrote:
>>>>>>
>>>>>>
>>>>>>> Mark Thomas wrote:
>>>>>>>
>>>>>>>
>>>>>>>> Next attempt.
>>>>>>>>
>>>>>>>> Taking account of the comments so far, a slightly modified
>>>>>>>> proposal is
>>>>>>>> below.
>>>>>>>>
>>>>>>>> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
>>>>>>>> https://svn.apache.org/repos/asf/tomcat/trunk
>>>>>>>>
>>>>>>>> svn cp
>>>>>>>> https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_14
>>>>>>>> https://svn.apache.org/repos/asf/tomcat/tc6.1.0/trunk
>>>>>>>>
>>>>>>>>
>>>>>>> Instead, I would propose to tag a new 6.0.15 candidate first.
>>>>>>>
>>>>>>>
>>>>>> That is also what I proposed in my previous comment.
>>>>>>
>>>>>>
>>>>> Didn't see it, sorry. I propose tagging a 6.0.15 candidate on Monday.
>>>>>
>>>>>
>>>> Can we wait a bit, there are a few bug fixes that need to be caught up
>>>> on , and I also think we can improve upon the server.xml invalid
>>>> attribute implementation, the way I did the sandbox. I'll come up withe
>>>> patches for the bug
>>>>
>>>>
>>> What is the PR number?
>>>
>>>
>> BZ 43478
>> http://svn.apache.org/viewvc?rev=581384&view=rev
>>
>
> +1 For this one.
>
> The stuff below I am -1 until more explanations.
>
it's a continuation of the 6.0 fix, based on the same code, but instead
of treating connectors like an exception case, it removes the exception
case and treats all components equal.
further more, it allows components with nested properties to set their
own rules, by doing the "boolean setProperty" instead of "void
setProperty". Of course, the old way is 100% backwards compatible.
> BTW: The comment of 581431 is "weird" no?
>
its a comment towards myself as I had to mess around some 'til I finally
got it right. you should have seen my first attempt (never showed in
SVN), but that was a debacle :)
> What PR does it fix?
>
same as 6.0, but more flexibility, and less exception cases. adds the
NIO connector, and adds consistency to the warning messages
Filip
> Cheers
>
> Jean-Frederic
>
>
>> http://svn.apache.org/viewvc?rev=581422&view=rev
>> http://svn.apache.org/viewvc?rev=581431&view=rev
>>
>> Filip
>>
>>
>>> Cheers
>>>
>>> Jean-Frederic
>>>
>>> and the fixes for the invalid attribute thingy, and
>>>
>>>
>>>> put them in the status file
>>>>
>>>> Filip
>>>>
>>>>
>>>>> Rémy
>>>>>
>>>>> ---------------------------------------------------------------------
>>>>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>>>>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>> ---------------------------------------------------------------------
>>>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>>>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>>>
>>>>
>>>>
>>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>>
>>>
>>>
>>>
>>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>
>>
>>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by jean-frederic clere <jf...@gmail.com>.
Filip Hanik - Dev Lists wrote:
> jean-frederic clere wrote:
>> Filip Hanik - Dev Lists wrote:
>>
>>> Remy Maucherat wrote:
>>>
>>>> jean-frederic clere wrote:
>>>>
>>>>> Remy Maucherat wrote:
>>>>>
>>>>>> Mark Thomas wrote:
>>>>>>
>>>>>>> Next attempt.
>>>>>>>
>>>>>>> Taking account of the comments so far, a slightly modified
>>>>>>> proposal is
>>>>>>> below.
>>>>>>>
>>>>>>> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
>>>>>>> https://svn.apache.org/repos/asf/tomcat/trunk
>>>>>>>
>>>>>>> svn cp
>>>>>>> https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_14
>>>>>>> https://svn.apache.org/repos/asf/tomcat/tc6.1.0/trunk
>>>>>>>
>>>>>> Instead, I would propose to tag a new 6.0.15 candidate first.
>>>>>>
>>>>> That is also what I proposed in my previous comment.
>>>>>
>>>> Didn't see it, sorry. I propose tagging a 6.0.15 candidate on Monday.
>>>>
>>> Can we wait a bit, there are a few bug fixes that need to be caught up
>>> on , and I also think we can improve upon the server.xml invalid
>>> attribute implementation, the way I did the sandbox. I'll come up withe
>>> patches for the bug
>>>
>>
>> What is the PR number?
>>
>
>
> BZ 43478
> http://svn.apache.org/viewvc?rev=581384&view=rev
+1 For this one.
The stuff below I am -1 until more explanations.
BTW: The comment of 581431 is "weird" no?
What PR does it fix?
Cheers
Jean-Frederic
> http://svn.apache.org/viewvc?rev=581422&view=rev
> http://svn.apache.org/viewvc?rev=581431&view=rev
>
> Filip
>
>> Cheers
>>
>> Jean-Frederic
>>
>> and the fixes for the invalid attribute thingy, and
>>
>>> put them in the status file
>>>
>>> Filip
>>>
>>>> Rémy
>>>>
>>>> ---------------------------------------------------------------------
>>>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>>>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>>>
>>>>
>>>>
>>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>>
>>>
>>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>
>>
>>
>>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by Filip Hanik - Dev Lists <de...@hanik.com>.
jean-frederic clere wrote:
> Filip Hanik - Dev Lists wrote:
>
>> Remy Maucherat wrote:
>>
>>> jean-frederic clere wrote:
>>>
>>>> Remy Maucherat wrote:
>>>>
>>>>> Mark Thomas wrote:
>>>>>
>>>>>> Next attempt.
>>>>>>
>>>>>> Taking account of the comments so far, a slightly modified proposal is
>>>>>> below.
>>>>>>
>>>>>> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
>>>>>> https://svn.apache.org/repos/asf/tomcat/trunk
>>>>>>
>>>>>> svn cp
>>>>>> https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_14
>>>>>> https://svn.apache.org/repos/asf/tomcat/tc6.1.0/trunk
>>>>>>
>>>>> Instead, I would propose to tag a new 6.0.15 candidate first.
>>>>>
>>>> That is also what I proposed in my previous comment.
>>>>
>>> Didn't see it, sorry. I propose tagging a 6.0.15 candidate on Monday.
>>>
>> Can we wait a bit, there are a few bug fixes that need to be caught up
>> on , and I also think we can improve upon the server.xml invalid
>> attribute implementation, the way I did the sandbox. I'll come up withe
>> patches for the bug
>>
>
> What is the PR number?
>
BZ 43478
http://svn.apache.org/viewvc?rev=581384&view=rev
http://svn.apache.org/viewvc?rev=581422&view=rev
http://svn.apache.org/viewvc?rev=581431&view=rev
Filip
> Cheers
>
> Jean-Frederic
>
> and the fixes for the invalid attribute thingy, and
>
>> put them in the status file
>>
>> Filip
>>
>>> Rémy
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>>
>>>
>>>
>>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>
>>
>>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by jean-frederic clere <jf...@gmail.com>.
Filip Hanik - Dev Lists wrote:
> Remy Maucherat wrote:
>> jean-frederic clere wrote:
>>> Remy Maucherat wrote:
>>>> Mark Thomas wrote:
>>>>> Next attempt.
>>>>>
>>>>> Taking account of the comments so far, a slightly modified proposal is
>>>>> below.
>>>>>
>>>>> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
>>>>> https://svn.apache.org/repos/asf/tomcat/trunk
>>>>>
>>>>> svn cp
>>>>> https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_14
>>>>> https://svn.apache.org/repos/asf/tomcat/tc6.1.0/trunk
>>>> Instead, I would propose to tag a new 6.0.15 candidate first.
>>>
>>> That is also what I proposed in my previous comment.
>>
>> Didn't see it, sorry. I propose tagging a 6.0.15 candidate on Monday.
> Can we wait a bit, there are a few bug fixes that need to be caught up
> on , and I also think we can improve upon the server.xml invalid
> attribute implementation, the way I did the sandbox. I'll come up withe
> patches for the bug
What is the PR number?
Cheers
Jean-Frederic
and the fixes for the invalid attribute thingy, and
> put them in the status file
>
> Filip
>>
>> Rémy
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>
>>
>>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by Remy Maucherat <re...@apache.org>.
Filip Hanik - Dev Lists wrote:
> Can we wait a bit, there are a few bug fixes that need to be caught up
> on , and I also think we can improve upon the server.xml invalid
> attribute implementation, the way I did the sandbox. I'll come up withe
> patches for the bug and the fixes for the invalid attribute thingy, and
> put them in the status file
No, I don't see any justification to wait without specific information
on bugs which would have to be fixed.
BTW, I'm still waiting for a statement that you will no longer engage in
personal attacks and rumor spreading. Similarly, r581431 and its really
cool comment makes me think you have not changed your development
strategies at all, and your consideration for other people's work. As a
result, I will not collaborate with you in any way for the time being.
Rémy
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by Filip Hanik - Dev Lists <de...@hanik.com>.
Remy Maucherat wrote:
> jean-frederic clere wrote:
>> Remy Maucherat wrote:
>>> Mark Thomas wrote:
>>>> Next attempt.
>>>>
>>>> Taking account of the comments so far, a slightly modified proposal is
>>>> below.
>>>>
>>>> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
>>>> https://svn.apache.org/repos/asf/tomcat/trunk
>>>>
>>>> svn cp
>>>> https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_14
>>>> https://svn.apache.org/repos/asf/tomcat/tc6.1.0/trunk
>>> Instead, I would propose to tag a new 6.0.15 candidate first.
>>
>> That is also what I proposed in my previous comment.
>
> Didn't see it, sorry. I propose tagging a 6.0.15 candidate on Monday.
Can we wait a bit, there are a few bug fixes that need to be caught up
on , and I also think we can improve upon the server.xml invalid
attribute implementation, the way I did the sandbox. I'll come up withe
patches for the bug and the fixes for the invalid attribute thingy, and
put them in the status file
Filip
>
> Rémy
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by Remy Maucherat <re...@apache.org>.
jean-frederic clere wrote:
> Remy Maucherat wrote:
>> Mark Thomas wrote:
>>> Next attempt.
>>>
>>> Taking account of the comments so far, a slightly modified proposal is
>>> below.
>>>
>>> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
>>> https://svn.apache.org/repos/asf/tomcat/trunk
>>>
>>> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_14
>>> https://svn.apache.org/repos/asf/tomcat/tc6.1.0/trunk
>> Instead, I would propose to tag a new 6.0.15 candidate first.
>
> That is also what I proposed in my previous comment.
Didn't see it, sorry. I propose tagging a 6.0.15 candidate on Monday.
Rémy
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn - Take 3
Posted by jean-frederic clere <jf...@gmail.com>.
Filip Hanik - Dev Lists wrote:
> Mark Thomas wrote:
>> jean-frederic clere wrote:
>>
>>> Why Friday? Shouldn't we wait until 6.0.15 (or 6.0.15 + n) is voted
>>> stable?
>>>
>>
>> We can do if that is the preference. My motivation is that I am keen
>> to get
>> back to a CTR codebase asap as I find only having RTC a real pain.
>>
> he he, I think everyone does, however two months ago you said
> "I don't see a need for a separate 6.0.x and 6.1.x development at this
> point. I have yet to see a convincing technical argument that there is
> something sufficiently new and/or different to justify this overhead."
>
> has anything changed since before when we had trunk and 6.0.x, to the
> point where we have more resources and more todos to maintain 6.0.x,
> 6.1.x and trunk? This is one more branch than we used to have.
>
> wouldn't it be better to hold of on the 6.1.x until there is a feature
> set for that release, and only have trunk. Otherwise we will have two
> 6.0.x branches, just one is named 6.1.x but there is nothing different
> with them
Yep. I also prefer to have only trunk based on 6.0.15 I don't think we
need 6.1.x for the moment. We should be able to make proposals for
tc6.0.x back porting using commits from trunk for a while.
Additional I think we should also create/prepare a ROADMAP in/for this
trunk to discuss what the new features we want to put inside.
Cheers
Jean-Frederic
>
>
> Filip
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn - Take 3
Posted by Mark Thomas <ma...@apache.org>.
Filip Hanik - Dev Lists wrote:
> Mark Thomas wrote:
>> jean-frederic clere wrote:
>>
>>> Why Friday? Shouldn't we wait until 6.0.15 (or 6.0.15 + n) is voted
>>> stable?
>>>
>>s
>> We can do if that is the preference. My motivation is that I am keen
>> to get
>> back to a CTR codebase asap as I find only having RTC a real pain.
>>
> he he, I think everyone does, however two months ago you said
> "I don't see a need for a separate 6.0.x and 6.1.x development at this
> point. I have yet to see a convincing technical argument that there is
> something sufficiently new and/or different to justify this overhead."
>
> has anything changed since before when we had trunk and 6.0.x, to the
> point where we have more resources and more todos to maintain 6.0.x,
> 6.1.x and trunk? This is one more branch than we used to have.
Yes and no. What has changed is that we voted to move to a CTR dev branch
and a RTC stable branch. What hasn't changed is my view that we don't want
to be supporting multiple stable 6.x branches at the same time.
There are some API changes for Geronimo and possibly others that people
want to introduce. An API change == version bump, so we are heeding towards
a stable 6.2.x branch using RTC and a dev branch that is CTR. The question
is how we get there with the minimum of hassle (mainly duplicated effort)
for all concerned.
> wouldn't it be better to hold of on the 6.1.x until there is a feature
> set for that release, and only have trunk. Otherwise we will have two
> 6.0.x branches, just one is named 6.1.x but there is nothing different
> with them
I agree we don't want multiple stable branches. What my last proposal[1]
implied but did not make explicit is that the 6.0.x branch is frozen as
soon as 6.0.15 is voted stable. If it isn't voted stable, then we wait
until we have a stable 6.0.x and then move forward as per [1].
That said, your point about agreeing a the feature set is a good one. Your
comments have sparked off what I think is a better idea. Look out for take
4 of the svn organisation, arriving in your inbox later this afternoon.
Mark
[1] http://marc.info/?l=tomcat-dev&m=119170194116793&w=2
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn - Take 3
Posted by Filip Hanik - Dev Lists <de...@hanik.com>.
Mark Thomas wrote:
> jean-frederic clere wrote:
>
>> Why Friday? Shouldn't we wait until 6.0.15 (or 6.0.15 + n) is voted stable?
>>
>
> We can do if that is the preference. My motivation is that I am keen to get
> back to a CTR codebase asap as I find only having RTC a real pain.
>
he he, I think everyone does, however two months ago you said
"I don't see a need for a separate 6.0.x and 6.1.x development at this
point. I have yet to see a convincing technical argument that there is
something sufficiently new and/or different to justify this overhead."
has anything changed since before when we had trunk and 6.0.x, to the
point where we have more resources and more todos to maintain 6.0.x,
6.1.x and trunk? This is one more branch than we used to have.
wouldn't it be better to hold of on the 6.1.x until there is a feature
set for that release, and only have trunk. Otherwise we will have two
6.0.x branches, just one is named 6.1.x but there is nothing different
with them
Filip
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn - Take 3
Posted by Rémy Maucherat <re...@apache.org>.
On Thu, 2007-11-01 at 10:03 +0000, Mark Thomas wrote:
> jean-frederic clere wrote:
> > Why Friday? Shouldn't we wait until 6.0.15 (or 6.0.15 + n) is voted
> stable?
>
> We can do if that is the preference. My motivation is that I am keen
> to get
> back to a CTR codebase asap as I find only having RTC a real pain.
Yes, this is why I had proposed less stringent process, inspired from
but not equivalent to the one from httpd (then my vote got hijacked).
Rémy
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn - Take 3
Posted by Mark Thomas <ma...@apache.org>.
jean-frederic clere wrote:
> Why Friday? Shouldn't we wait until 6.0.15 (or 6.0.15 + n) is voted stable?
We can do if that is the preference. My motivation is that I am keen to get
back to a CTR codebase asap as I find only having RTC a real pain.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn - Take 3
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Mark Thomas wrote:
> William A. Rowe, Jr. wrote:
>> Contrawise, why wait, and why a tag? Usually most efforts (in order to
>> preserve history) branch from trunk or branches, whereas tags/* reflect
>> an endpoint (end of history). Simply branch from 6.0.x unless there are
>> dirty secrets buried in there :)
>
> Because 6.0.15 (assuming it is stable) is intended to be the end of the
> 6.0.x branch. It is expected that the tag 6.0.15 == 6.0.x trunk.
Just to clear things up, I've made my share of svn mistakes, and using the
tags/* result for anything other than and endpoint is one that I lived to
regret (my doing, so my dogfood.)
Assuming cp /branches/6.0.x /tags/6.0.15 happened at r678123, it's vastly
still preferable to cp -r678123 /branches/6.0.x /trunk/ - that was my point,
not what code y'all are agreeing to use, nor how many trunks and branches
y'all want to struggle with :)
Consider all the recent rearrangement of tags/ you made, this isn't something
you want to have to struggle to unwind four years from now.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn - Take 3
Posted by Mark Thomas <ma...@apache.org>.
William A. Rowe, Jr. wrote:
> jean-frederic clere wrote:
>> Mark Thomas wrote:
>>> Mark Thomas wrote:
>>>> svn cp
>>>> https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_15
>>>> https://svn.apache.org/repos/asf/tomcat/tc6.1.0/trunk
>>>>
>>>> https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_15
>>>> https://svn.apache.org/repos/asf/tomcat/trunk
>>>>
>>>> Changes to .../trunk with be CTR
>>>> Changes to .../6.1.x/trunk will be RTC
>>> As per the previously published plan, I will create tomcat/tc6.1.x/trunk
>>> and tomcat/trunk from the 6.0.15 tag. I plan to do this sometime on
>>> Friday
>>> afternoon GMT.
>>
>> Why Friday? Shouldn't we wait until 6.0.15 (or 6.0.15 + n) is voted
>> stable?
>
> Contrawise, why wait, and why a tag? Usually most efforts (in order to
> preserve history) branch from trunk or branches, whereas tags/* reflect
> an endpoint (end of history). Simply branch from 6.0.x unless there are
> dirty secrets buried in there :)
Because 6.0.15 (assuming it is stable) is intended to be the end of the
6.0.x branch. It is expected that the tag 6.0.15 == 6.0.x trunk.
There was a long discussion in this thread:
http://marc.info/?t=119154952900016&r=1&w=2
which was distilled into a new proposal:
http://marc.info/?l=tomcat-dev&m=119170194116793&w=2
Mark
>
> Bill
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn - Take 3
Posted by Filip Hanik - Dev Lists <de...@hanik.com>.
William A. Rowe, Jr. wrote:
> jean-frederic clere wrote:
>> Mark Thomas wrote:
>>> Mark Thomas wrote:
>>>> svn cp
>>>> https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_15
>>>> https://svn.apache.org/repos/asf/tomcat/tc6.1.0/trunk
>>>>
>>>> https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_15
>>>> https://svn.apache.org/repos/asf/tomcat/trunk
>>>>
>>>> Changes to .../trunk with be CTR
>>>> Changes to .../6.1.x/trunk will be RTC
>>> As per the previously published plan, I will create
>>> tomcat/tc6.1.x/trunk
>>> and tomcat/trunk from the 6.0.15 tag. I plan to do this sometime on
>>> Friday
>>> afternoon GMT.
>>
>> Why Friday? Shouldn't we wait until 6.0.15 (or 6.0.15 + n) is voted
>> stable?
>
> Contrawise, why wait, and why a tag? Usually most efforts (in order to
> preserve history) branch from trunk or branches, whereas tags/* reflect
> an endpoint (end of history). Simply branch from 6.0.x unless there are
> dirty secrets buried in there :)
one reason we would wait, is cause there are no ongoing efforts. at
least none that are documented, and as Mark said two months ago,
"I don't see a need for a separate 6.0.x and 6.1.x development at this
point. I have yet to see a convincing technical argument that there is
something sufficiently new and/or different to justify this overhead."
we still haven't documented what this "ongoing effort would be" nor have
we agreed on it.
From what it sounds like right now, and the technical argument and the
reason to get a trunk, would be to have more liberty adding in fixes and
patches,and then have an easier way to propose it back to be a fix in 6.0.
Filip
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn - Take 3
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
jean-frederic clere wrote:
> Mark Thomas wrote:
>> Mark Thomas wrote:
>>> svn cp
>>> https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_15
>>> https://svn.apache.org/repos/asf/tomcat/tc6.1.0/trunk
>>>
>>> https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_15
>>> https://svn.apache.org/repos/asf/tomcat/trunk
>>>
>>> Changes to .../trunk with be CTR
>>> Changes to .../6.1.x/trunk will be RTC
>> As per the previously published plan, I will create tomcat/tc6.1.x/trunk
>> and tomcat/trunk from the 6.0.15 tag. I plan to do this sometime on Friday
>> afternoon GMT.
>
> Why Friday? Shouldn't we wait until 6.0.15 (or 6.0.15 + n) is voted stable?
Contrawise, why wait, and why a tag? Usually most efforts (in order to
preserve history) branch from trunk or branches, whereas tags/* reflect
an endpoint (end of history). Simply branch from 6.0.x unless there are
dirty secrets buried in there :)
Bill
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn - Take 3
Posted by Peter Rossbach <pr...@objektpark.de>.
Good point
+1
Peter
Am 01.11.2007 um 09:51 schrieb jean-frederic clere:
> Mark Thomas wrote:
>> Mark Thomas wrote:
>>> svn cp
>>> https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_15
>>> https://svn.apache.org/repos/asf/tomcat/tc6.1.0/trunk
>>>
>>> https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_15
>>> https://svn.apache.org/repos/asf/tomcat/trunk
>>>
>>> Changes to .../trunk with be CTR
>>> Changes to .../6.1.x/trunk will be RTC
>>
>> As per the previously published plan, I will create tomcat/tc6.1.x/
>> trunk
>> and tomcat/trunk from the 6.0.15 tag. I plan to do this sometime
>> on Friday
>> afternoon GMT.
>
> Why Friday? Shouldn't we wait until 6.0.15 (or 6.0.15 + n) is voted
> stable?
>
> Cheers
>
> Jean-Frederic
>
>> Any commits to 6.0.x/trunk between now and then I will apply
>> using CTR to trunk.
>>
>> Mark
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>
>>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
Re: Time to organise svn - Take 3
Posted by jean-frederic clere <jf...@gmail.com>.
Mark Thomas wrote:
> Mark Thomas wrote:
>> svn cp
>> https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_15
>> https://svn.apache.org/repos/asf/tomcat/tc6.1.0/trunk
>>
>> https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_15
>> https://svn.apache.org/repos/asf/tomcat/trunk
>>
>> Changes to .../trunk with be CTR
>> Changes to .../6.1.x/trunk will be RTC
>
> As per the previously published plan, I will create tomcat/tc6.1.x/trunk
> and tomcat/trunk from the 6.0.15 tag. I plan to do this sometime on Friday
> afternoon GMT.
Why Friday? Shouldn't we wait until 6.0.15 (or 6.0.15 + n) is voted stable?
Cheers
Jean-Frederic
> Any commits to 6.0.x/trunk between now and then I will apply
> using CTR to trunk.
>
> Mark
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn - Take 3
Posted by Mark Thomas <ma...@apache.org>.
Mark Thomas wrote:
> svn cp
> https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_15
> https://svn.apache.org/repos/asf/tomcat/tc6.1.0/trunk
>
> https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_15
> https://svn.apache.org/repos/asf/tomcat/trunk
>
> Changes to .../trunk with be CTR
> Changes to .../6.1.x/trunk will be RTC
As per the previously published plan, I will create tomcat/tc6.1.x/trunk
and tomcat/trunk from the 6.0.15 tag. I plan to do this sometime on Friday
afternoon GMT. Any commits to 6.0.x/trunk between now and then I will apply
using CTR to trunk.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Time to organise svn - Take 3
Posted by Mark Thomas <ma...@apache.org>.
After the latest round of comments, the plan is:
Tag 6.0.15 early next week.
svn cp
https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_15
https://svn.apache.org/repos/asf/tomcat/tc6.1.0/trunk
https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_15
https://svn.apache.org/repos/asf/tomcat/trunk
Changes to .../trunk with be CTR
Changes to .../6.1.x/trunk will be RTC
Soon after release 6.1.0 as alpha/beta
Possibly release a few more 6.1.x as alpha/beta as required
Once we are happy that we have a 6.1.x release that represents what we
want in 6.2.x then:
https://svn.apache.org/repos/asf/tomcat/tc6.1.x/tags/TOMCAT_6_1_YY
https://svn.apache.org/repos/asf/tomcat/tc6.2.0/trunk
Changes to .../6.1.x/trunk will be frozen
Changes to .../6.2.x/trunk will be RTC
Make stable releases from 6.2.x as required.
Make alpha/beta releases from trunk as required (not expecting any for
a while).
At some point in the future when we start thinking about 6.4.x or
7.0.x then that will be created from trunk.
I'm still aiming for mid-week for these changes, assuming 6.0.15 is
tagged early in the week.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by Mark Thomas <ma...@apache.org>.
jean-frederic clere wrote:
> Remy Maucherat wrote:
>> Mark Thomas wrote:
>>> Next attempt.
>>>
>>> Taking account of the comments so far, a slightly modified proposal is
>>> below.
>>>
>>> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
>>> https://svn.apache.org/repos/asf/tomcat/trunk
>>>
>>> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_14
>>> https://svn.apache.org/repos/asf/tomcat/tc6.1.0/trunk
>> Instead, I would propose to tag a new 6.0.15 candidate first.
>
> That is also what I proposed in my previous comment.
Sorry - mis-understood what you meant. That makes things a lot
simpler. I'll write up take 3 later tonight.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by jean-frederic clere <jf...@gmail.com>.
Remy Maucherat wrote:
> Mark Thomas wrote:
>> Next attempt.
>>
>> Taking account of the comments so far, a slightly modified proposal is
>> below.
>>
>> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
>> https://svn.apache.org/repos/asf/tomcat/trunk
>>
>> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_14
>> https://svn.apache.org/repos/asf/tomcat/tc6.1.0/trunk
>
> Instead, I would propose to tag a new 6.0.15 candidate first.
That is also what I proposed in my previous comment.
Cheers
Jean-Frederic
>
> Rémy
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by Remy Maucherat <re...@apache.org>.
Mark Thomas wrote:
> Next attempt.
>
> Taking account of the comments so far, a slightly modified proposal is
> below.
>
> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
> https://svn.apache.org/repos/asf/tomcat/trunk
>
> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_14
> https://svn.apache.org/repos/asf/tomcat/tc6.1.0/trunk
Instead, I would propose to tag a new 6.0.15 candidate first.
Rémy
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by Rainer Jung <ra...@kippdata.de>.
Mark Thomas wrote:
> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
> https://svn.apache.org/repos/asf/tomcat/trunk
>
> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_14
> https://svn.apache.org/repos/asf/tomcat/tc6.1.0/trunk
RTC on tc6.0.x/trunk
> RTC on .../6.1.x/trunk
> CTR on .../trunk
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by Mark Thomas <ma...@apache.org>.
Next attempt.
Taking account of the comments so far, a slightly modified proposal is
below.
svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
https://svn.apache.org/repos/asf/tomcat/trunk
svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_14
https://svn.apache.org/repos/asf/tomcat/tc6.1.0/trunk
RTC on .../6.1.x/trunk
CTR on .../trunk
Select which commits we want in 6.1.x (beta) which will form the basis
for 6.2.x (stable). Do a release (maybe more) from 6.1.x. Once we are
happy, freeze 6.1.x and create 6.2.x from the latest 6.1.x tag ie
https://svn.apache.org/repos/asf/tomcat/tc6.1.x/tags/TOMCAT_6_1_YY
https://svn.apache.org/repos/asf/tomcat/tc6.2.0/trunk
RTC on .../6.2.x/trunk
Release stable 6.2.x versions as required
Release beta 6.3.x versions as required (not expecting this for a
while unless we change the 6.x API or the next spec version comes along)
I'll push back doing this until Wednesday next week to give more time
for discussion.
Thoughts,
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by jean-frederic clere <jf...@gmail.com>.
Mark Thomas wrote:
> William A. Rowe, Jr. wrote:
>> Actually, the way it typically works at httpd-space (which your new
>> policy is based on) is that you would next create 6.1.0 as a forever
>> development branch. Committers apply each patch they believe belongs
>> to the 6.2.0 release, and things are removed and readded as various
>> votes and discussions proceed.
>
> OK. I think I have it now. Does the the following make more sense?
>
> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
> https://svn.apache.org/repos/asf/tomcat/tc6.1.x/trunk
No.
>
> svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
> https://svn.apache.org/repos/asf/tomcat/trunk
>
Yes that more similar to httpd so that probably a better solution.
> and then
> - Make all changes in trunk (CTR)
We should have a roadmap of what we want to do before starting.
> - Port those API changes we want in 6.2.x from trunk to 6.1.x (RTC)
> - A beta release of 6.1.x
tagging trunk.
> - Once we are happy with 6.1.x, freeze it, create 6.2.x and do a
> stable release
6.2.x will then be like the actual
https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
> - Continue to port non-API modifying changes from trunk to 6.2.x as RTC
> - At some point in the future, trunk is branched to form 6.3.x which
> is used as the basis for 6.4.x or 7.0.x
We could have beta 6.3.x tags of trunk at that time.
Cheers
Jean-Frederic
>
> Mark
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by Mark Thomas <ma...@apache.org>.
William A. Rowe, Jr. wrote:
> Actually, the way it typically works at httpd-space (which your new
> policy is based on) is that you would next create 6.1.0 as a forever
> development branch. Committers apply each patch they believe belongs
> to the 6.2.0 release, and things are removed and readded as various
> votes and discussions proceed.
OK. I think I have it now. Does the the following make more sense?
svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
https://svn.apache.org/repos/asf/tomcat/tc6.1.x/trunk
svn cp https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk
https://svn.apache.org/repos/asf/tomcat/trunk
and then
- Make all changes in trunk (CTR)
- Port those API changes we want in 6.2.x from trunk to 6.1.x (RTC)
- A beta release of 6.1.x
- Once we are happy with 6.1.x, freeze it, create 6.2.x and do a
stable release
- Continue to port non-API modifying changes from trunk to 6.2.x as RTC
- At some point in the future, trunk is branched to form 6.3.x which
is used as the basis for 6.4.x or 7.0.x
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Mark Thomas wrote:
> William A. Rowe, Jr. wrote:
>> Mark Thomas wrote:
>>> In light of the recent vote, we need to make some changes to svn. In
>>> short we need to add:
>>> 6.2.x
>> ? Where is 6.1.0, or in other words, why the skip?
>
> The idea was to use even numbers for stable releases, odd numbers for
> alpha/beta. I would expect to see releases from trunk (if any) to be
> 6.3.x.
Actually, the way it typically works at httpd-space (which your new
policy is based on) is that you would next create 6.1.0 as a forever
development branch. Committers apply each patch they believe belongs
to the 6.2.0 release, and things are removed and readded as various
votes and discussions proceed.
When the crowd is satisfied that tomcat 6.1.0 represents everything that
is part of the next general release (by a vote, obviously), it's branched
to 6.2.0 (ending the life of the 6.1.0 branch) and that API becomes the
reference for the entire lifespan of 6.2.0. E.g. API changes all happen
in branches/6.1.0 and never happen in branches/6.2.0
Of course tomcat can choose it's own way, but it seemed like you were
skipping a step if you aimed to emulate the even's-odd's way of doing
things.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by Mark Thomas <ma...@apache.org>.
William A. Rowe, Jr. wrote:
> Mark Thomas wrote:
>> In light of the recent vote, we need to make some changes to svn. In
>> short we need to add:
>> 6.2.x
>
> ? Where is 6.1.0, or in other words, why the skip?
The idea was to use even numbers for stable releases, odd numbers for
alpha/beta. I would expect to see releases from trunk (if any) to be
6.3.x.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Time to organise svn
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Mark Thomas wrote:
> In light of the recent vote, we need to make some changes to svn. In
> short we need to add:
> 6.2.x
? Where is 6.1.0, or in other words, why the skip?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org