kfujino | 1 Sep 02:45 2011
Picon

svn commit: r1163879 - /tomcat/tc6.0.x/trunk/STATUS.txt

Author: kfujino
Date: Thu Sep  1 00:45:00 2011
New Revision: 1163879

URL: http://svn.apache.org/viewvc?rev=1163879&view=rev
Log:
my vote

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1163879&r1=1163878&r2=1163879&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep  1 00:45:00 2011
 <at>  <at>  -93,13 +93,13  <at>  <at>  PATCHES PROPOSED TO BACKPORT:
 * Fix two typos in tomcat.nsi (uppercase vs. lowercase in a macro call and in a message)
   Already fixed in 5.5, 7.0, trunk.
   http://svn.apache.org/viewvc?rev=1161310&view=rev
-  +1: kkolinko, markt
+  +1: kkolinko, markt, kfujino
   -1:

 * Detect incomplete AJP messages and reject the associated request if one is
   found
   http://people.apache.org/~markt/patches/2011-08-25-ajp-incomplete-msg-tc6.patch
-  +1: markt
+  +1: markt, kfujino
   +1: kkolinko:
(Continue reading)

bugzilla | 1 Sep 03:15 2011
Picon

DO NOT REPLY [Bug 51745] getLastModified of compilation context returns 0 on Android and it issues all time recompilation

https://issues.apache.org/bugzilla/show_bug.cgi?id=51745

--- Comment #3 from d rogatkin <metricstream <at> gmail.com> 2011-09-01 01:15:24 UTC ---
I have checked with Android team, and it looks like Harmony bug was fixed for
Android 2.3 (Gingerbread), however still exists for earlier Androids. Perhaps
this problem can be closed.

--

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
Sylvain Laurent | 1 Sep 06:48 2011
Picon

Re: svn commit: r1163804 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml


Le 31 août 2011 à 23:12, Mark Thomas <markt <at> apache.org> a écrit :

> On 31/08/2011 21:37, slaurent <at> apache.org wrote:
>> +<section name="Tomcat 7.0.22">
> 
> You left out the (markt)
> 
I thought it represented the person who finalized the release, so I left it out.

>> +  <subsection name="Catalina">
>> +    <changelog>
>> +      <fix>
>> +        <bug>51744</bug>: Prevent application code from closing the associated
>> +        JNDI context while the application is running. (markt)
>> +      </fix>
>> +      <add>
>> +        <bug>51741</bug>: Fixes a problem with Eclipse WTP "Serve modules without 
>> +        publishing" feature where applications failed to access resources when using
>> +        getResource() on the classloader. (slaurent)
>> +      </add>
>> +    </changelog>
>> +  </subsection>
>> +  <subsection name="Coyote">
>> +    <changelog>
>> +    </changelog>
>> +  </subsection>
> 
> We don't add sections to the changelog until they are required. These
> empty sections can be removed.
(Continue reading)

Sylvain Laurent | 1 Sep 07:00 2011
Picon

Re: svn commit: r1163807 - in /tomcat: tc7.0.x/trunk/ trunk/


Le 31 août 2011 à 23:13, Mark Thomas <markt <at> apache.org> a écrit :

> On 31/08/2011 21:38, slaurent <at> apache.org wrote:
>> --- subclipse:tags (added)
>> +++ subclipse:tags Wed Aug 31 20:38:53 2011
>>  <at>  <at>  -0,0 +1,2  <at>  <at> 
>> +932358,branches,/tomcat/tc7.0.x/branches,branch
>> +1162976,TOMCAT_7_0_21,/tomcat/tc7.0.x/tags/TOMCAT_7_0_21,tag
> 
> What is this? It looks like junk that needs to be removed to me.
> 
It's part of subclipse support for tags and branches : http://subclipse.tigris.org/branch_tag.html

This is very convenient, and I don't think it bothers developers who don't use subclipse.

Sylvain
Sylvain Laurent | 1 Sep 07:05 2011
Picon

Re: svn commit: r1163802 - in /tomcat: tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java trunk/java/org/apache/catalina/loader/WebappClassLoader.java

I'm using subclipse which contains a 1.6 svn client. I'm not an svn expert, I'll try to do as Mark recommends,
I see the point of performing the merge after so that svn can keep track of things.

Sylvain

Le 1 sept. 2011 à 00:34, Konstantin Kolinko <knst.kolinko <at> gmail.com> a écrit :

> 2011/9/1 Mark Thomas <markt <at> apache.org>:
>> On 31/08/2011 22:57, Konstantin Kolinko wrote:
>>> 2011/9/1 Mark Thomas <markt <at> apache.org>:
>>>> On 31/08/2011 21:35, slaurent <at> apache.org wrote:
>>>>> Author: slaurent
>>>>> Date: Wed Aug 31 20:35:22 2011
>>>>> New Revision: 1163802
>>>>> 
>>>>> URL: http://svn.apache.org/viewvc?rev=1163802&view=rev
>>>>> Log:
>>>>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51741
>>>>> bug 51741: Eclipse WTP "Serve modules without publishing" broken with tc7, needs patch in tomcat
>>>> 
>>>> This should have been applied just to /trunk and then merged to 7.0.x/trunk.
>>>> 
>>> 
>>> This Sylvain's commit patches both trunk and 7.0.x at the same time.
>>> Thus there is no need to merge.
>> 
>> I know what the patch did. The point is that committing like this messes
>> with the mergeinfo. It may (or may not) cause us some headaches at some
>> point in the future. Given we don't have to commit trunk and 7.0.x/trunk
>> together, I'd rather we continued with the current practise of trunk
(Continue reading)

Sylvain Laurent | 1 Sep 07:06 2011
Picon

Re: svn commit: r1163855 - in /tomcat: tc7.0.x/trunk/ trunk/

Would it really hurt to keep those properties?

Le 1 sept. 2011 à 00:45, kkolinko <at> apache.org a écrit :

> Author: kkolinko
> Date: Wed Aug 31 22:45:23 2011
> New Revision: 1163855
> 
> URL: http://svn.apache.org/viewvc?rev=1163855&view=rev
> Log:
> Revert r1163807:
> Remove subclipse:tags property.
> 
> Modified:
>    tomcat/tc7.0.x/trunk/   (props changed)
>    tomcat/trunk/   (props changed)
> 
> Propchange: tomcat/tc7.0.x/trunk/
>            ('subclipse:tags' removed)
> 
> Propchange: tomcat/trunk/
>            ('subclipse:tags' removed)
> 
> 
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe <at> tomcat.apache.org
> For additional commands, e-mail: dev-help <at> tomcat.apache.org
> 
(Continue reading)

Konstantin Kolinko | 1 Sep 12:11 2011
Picon

Re: svn commit: r1163807 - in /tomcat: tc7.0.x/trunk/ trunk/

2011/9/1 Sylvain Laurent <sylvain.laurent <at> gmail.com>:
> Le 31 août 2011 à 23:13, Mark Thomas <markt <at> apache.org> a écrit :
>
>> On 31/08/2011 21:38, slaurent <at> apache.org wrote:
>>> --- subclipse:tags (added)
>>> +++ subclipse:tags Wed Aug 31 20:38:53 2011
>>>  <at>  <at>  -0,0 +1,2  <at>  <at> 
>>> +932358,branches,/tomcat/tc7.0.x/branches,branch
>>> +1162976,TOMCAT_7_0_21,/tomcat/tc7.0.x/tags/TOMCAT_7_0_21,tag
>>
>> What is this? It looks like junk that needs to be removed to me.
>>
> It's part of subclipse support for tags and branches :
> http://subclipse.tigris.org/branch_tag.html
>
> This is very convenient, and I don't think it bothers developers who don't use subclipse.

1. What happens when someone creates a tag (aka svn copy) in another
svn client? Should one remove the value, or leave it as is?

2. It duplicates information that is already in repository.
If it were just configuration value (e.g. "see tags there")...., but
it lists all nn tags.

3. The property value on /tomcat/trunk was wrong.

 - it should not have been added there. You wouldn't list 7.0.x tags on trunk.
 - /tomcat/tc7.0.x/branches is not a branch

A branch would be /tomcat/tc7.0.x/branches/≤name>
(Continue reading)

kfujino | 1 Sep 12:26 2011
Picon

svn commit: r1163986 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java

Author: kfujino
Date: Thu Sep  1 10:26:13 2011
New Revision: 1163986

URL: http://svn.apache.org/viewvc?rev=1163986&view=rev
Log:
Avoid IllegalArgumentException when setting maxActive less than or equal to 0.
ArrayBlockingQueue doesn't allow capacity of 0 or less.

Modified:
    tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java

Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1163986&r1=1163985&r2=1163986&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java (original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Thu Sep  1 10:26:13 2011
 <at>  <at>  -394,22 +394,6  <at>  <at>  public class ConnectionPool {
      */
     protected void init(PoolConfiguration properties) throws SQLException {
         poolProperties = properties;
-        //make space for 10 extra in case we flow over a bit
-        busy = new ArrayBlockingQueue<PooledConnection>(properties.getMaxActive(),false);
-        //busy = new FairBlockingQueue<PooledConnection>();
-        //make space for 10 extra in case we flow over a bit
-        if (properties.isFairQueue()) {
-            idle = new FairBlockingQueue<PooledConnection>();
(Continue reading)

kfujino | 1 Sep 12:37 2011
Picon

svn commit: r1163992 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Author: kfujino
Date: Thu Sep  1 10:37:17 2011
New Revision: 1163992

URL: http://svn.apache.org/viewvc?rev=1163992&view=rev
Log:
Add changelog for r1163986.
In jdbc-pool: Avoid IllegalArgumentException when setting maxActive less than or equal to 0.
ArrayBlockingQueue doesn't allow capacity of 0 or less.

Modified:
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1163992&r1=1163991&r2=1163992&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Sep  1 10:37:17 2011
 <at>  <at>  -85,6 +85,11  <at>  <at> 
   </subsection>
   <subsection name="Other">
     <changelog>
+    <fix>
+        In jdbc-pool: Avoid IllegalArgumentException when setting maxActive 
+        less than or equal to 0.
+        ArrayBlockingQueue doesn't allow capacity of 0 or less. (kfujino)
+      </fix>
     </changelog>
   </subsection>  
 </section>
(Continue reading)

Mark Thomas | 1 Sep 12:57 2011
Picon

Re: svn commit: r1163802 - in /tomcat: tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java trunk/java/org/apache/catalina/loader/WebappClassLoader.java

On 31/08/2011 23:34, Konstantin Kolinko wrote:
> We already did such updates to trunk+branch when working on 6.0.x and
> I prefer to keep this practice.

Committing to trunk and 7.0.x at the same time may also cause
complications if we want to merge the patch back to 6.0.x. 5.5.x is less
on an issue since the different structure almost always means a manual
merge any way.

I continue to think that the simplest way to handle this is as we have
been doing.

Commit to trunk
Merge trunk -> 7.0.x unless trunk specific
Merge trunk -> 6.0.x if required
Merge trunk -> 5.5.x if required (may be manual)

Mark

Gmane