svn commit: r900695 - in /tomcat/native/branches/1.1.x/xdocs: index.xml news/2010.xml project.xml

2010-01-19 Thread rjung
Author: rjung
Date: Tue Jan 19 08:05:49 2010
New Revision: 900695

URL: http://svn.apache.org/viewvc?rev=900695&view=rev
Log:
Fix typos.

Modified:
tomcat/native/branches/1.1.x/xdocs/index.xml
tomcat/native/branches/1.1.x/xdocs/news/2010.xml
tomcat/native/branches/1.1.x/xdocs/project.xml

Modified: tomcat/native/branches/1.1.x/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/index.xml?rev=900695&r1=900694&r2=900695&view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/index.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/index.xml Tue Jan 19 08:05:49 2010
@@ -45,7 +45,7 @@
 
 
 
-08 January 2010 - TC-Native-1.1.19 
released
+8 January 2010 - TC-Native-1.1.19 
released
 The Apache Tomcat team is proud to announce the immediate availability of 
Tomcat Native 1.1.19 Stable.
 
 Download the http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.19/source/tomcat-native-1.1.19-src.tar.gz";>TC-native
 1.1.19 release sources

Modified: tomcat/native/branches/1.1.x/xdocs/news/2010.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/news/2010.xml?rev=900695&r1=900694&r2=900695&view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/news/2010.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/news/2010.xml Tue Jan 19 08:05:49 2010
@@ -32,7 +32,7 @@
 
 
 
-08 January - TC-Native-1.1.19 released
+8 January - TC-Native-1.1.19 released
 
 The Apache Tomcat team is proud to announce the immediate availability
 of Tomcat Native 1.1.19. This is a stable release adding some bug fixes.

Modified: tomcat/native/branches/1.1.x/xdocs/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/project.xml?rev=900695&r1=900694&r2=900695&view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/project.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/project.xml Tue Jan 19 08:05:49 2010
@@ -35,7 +35,7 @@
 
 
 
-
+
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: native-doc part of Tomcat site: outdated?

2010-01-19 Thread Rainer Jung

On 19.01.2010 01:59, Konstantin Kolinko wrote:

Is http://tomcat.apache.org/native-doc/  generated from /native/trunk,
or from /native/branches/1.1.x/  ?

Apparently the site for 1.1.18 was generated from trunk, but the one
for 1.1.19 from the 1.1.x branch.


I'd say should be generated from branches/1.1.x, because trunk is not 
ready. for docs.



2. The main page of native-doc [3] lists "10 September 2008 -
TC-Native-1.1.15 released" as the most recent news item. Subsequent
releases are not mentioned.

[3] http://tomcat.apache.org/native-doc/index.html


A bit of a mess, but I think that the site from the branch is the right one.


I updated the docs with the other release notes etc. The docs from 1.1.x 
head are now pushed to people.a.o and wait for sync to tomcat.a.o.



Probably we shouldn't maintain changelog-1.1.x.html [2] in the trunk,
because it duplicates effort.


Probably. There's no need for maintaining before a first release of 
trunk is done, but I'd say its OK to drop it.



I'll update the link on the main site. Be sure to use the right link
in the announcement.


Thanks.

Mladen: I think there was no official announcement about 1.1.19 until 
now, only a vote result and the site updates?


Regards,

Rainer

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: native-doc part of Tomcat site: outdated?

2010-01-19 Thread Konstantin Kolinko
2010/1/19 Rainer Jung :
> On 19.01.2010 01:59, Konstantin Kolinko wrote:
>>
>> Is http://tomcat.apache.org/native-doc/  generated from /native/trunk,
>> or from /native/branches/1.1.x/  ?
>>
>> Apparently the site for 1.1.18 was generated from trunk, but the one
>> for 1.1.19 from the 1.1.x branch.
>
> I'd say should be generated from branches/1.1.x, because trunk is not ready.
> for docs.
>
>> 2. The main page of native-doc [3] lists "10 September 2008 -
>> TC-Native-1.1.15 released" as the most recent news item. Subsequent
>> releases are not mentioned.
>>
>> [3] http://tomcat.apache.org/native-doc/index.html
>>
>>
>> A bit of a mess, but I think that the site from the branch is the right
>> one.
>
> I updated the docs with the other release notes etc. The docs from 1.1.x
> head are now pushed to people.a.o and wait for sync to tomcat.a.o.

Thank you!

I think the download link should point to
http://tomcat.apache.org/download-native.cgi

(and not to www.apache.org/dist/ directly)

>> Probably we shouldn't maintain changelog-1.1.x.html [2] in the trunk,
>> because it duplicates effort.
>
> Probably. There's no need for maintaining before a first release of trunk is
> done, but I'd say its OK to drop it.
>
>> I'll update the link on the main site. Be sure to use the right link
>> in the announcement.
>
> Mladen: I think there was no official announcement about 1.1.19 until now,
> only a vote result and the site updates?

Also, the 1.1.18 announcement missed the new
annou...@tomcat.apache.org mail list,
http://mail-archives.apache.org/mod_mbox/tomcat-announce/


Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



trimSpaces

2010-01-19 Thread Kevin Jackson
Hi,

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

This fix would be very beneficial for us, although I'm aware that the
addition of this would make an application deployed in tomcat emit
different output than an app deployed on say jetty.

I'm willing to merge this with the trunk (for tomcat7) if people's
time is a factor and to test it.

Thanks,
Kev

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r900729 - /tomcat/trunk/dist.xml

2010-01-19 Thread kkolinko
Author: kkolinko
Date: Tue Jan 19 11:27:33 2010
New Revision: 900729

URL: http://svn.apache.org/viewvc?rev=900729&view=rev
Log:
Use CRLF line ends in conf/* files installed by the Windows exe installer

Modified:
tomcat/trunk/dist.xml

Modified: tomcat/trunk/dist.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=900729&r1=900728&r2=900729&view=diff
==
--- tomcat/trunk/dist.xml (original)
+++ tomcat/trunk/dist.xml Tue Jan 19 11:27:33 2010
@@ -329,6 +329,8 @@
 
 
 
+
+
 
 

svn commit: r900740 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java container/webapps/docs/changelog.xml

2010-01-19 Thread kkolinko
Author: kkolinko
Date: Tue Jan 19 11:49:56 2010
New Revision: 900740

URL: http://svn.apache.org/viewvc?rev=900740&view=rev
Log:
Include root cause exception into the one produced by 
ApplicationContextFacade#doPrivileged()

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=900740&r1=900739&r2=900740&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jan 19 11:49:56 2010
@@ -95,11 +95,6 @@
   +1: kkolinko, markt, rjung
   -1:
 
-* Include root cause exception into the one produced by 
ApplicationContextFacade#doPrivileged()
-  http://svn.apache.org/viewvc?rev=831819&view=rev
-  +1: kkolinko, markt, rjung
-  -1:
-
 * Fix CVE-2009-3548 - Windows installer uses insecure default password
   http://svn.apache.org/viewvc?rev=834047&view=rev
   +1: markt, mturk

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java?rev=900740&r1=900739&r2=900740&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java
 Tue Jan 19 11:49:56 2010
@@ -374,7 +374,7 @@
 try{
 return invokeMethod(context, methodName, params);
 }catch(Throwable t){
-throw new RuntimeException(t.getMessage());
+throw new RuntimeException(t.getMessage(), t);
 }
 }
 

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=900740&r1=900739&r2=900740&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue Jan 19 
11:49:56 2010
@@ -97,6 +97,10 @@
   
 Close resource stream in WebappClassLoader after read error. (pero)
   
+  
+Do not swallow exceptions in ApplicationContextFacade.doPrivileged()
+(kkolinko)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r900749 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

2010-01-19 Thread kkolinko
Author: kkolinko
Date: Tue Jan 19 12:09:10 2010
New Revision: 900749

URL: http://svn.apache.org/viewvc?rev=900749&view=rev
Log:
Correct a subsection name, to match previous releases

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

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=900749&r1=900748&r2=900749&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jan 19 12:09:10 2010
@@ -42,7 +42,7 @@
   
 
   
-  
+  
 
   
 Remove broken link in README.html. (jfclere)



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r900750 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java container/webapps/docs/changelog.xml

2010-01-19 Thread kkolinko
Author: kkolinko
Date: Tue Jan 19 12:14:39 2010
New Revision: 900750

URL: http://svn.apache.org/viewvc?rev=900750&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=48097
Make WebappClassLoader to do not swallow AccessControlException

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=900750&r1=900749&r2=900750&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jan 19 12:14:39 2010
@@ -74,10 +74,6 @@
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48097
   There are two patches to be applied:
-  1) Make WebappClassLoader to do not swallow AccessControlException
-  http://svn.apache.org/viewvc?rev=831828&view=rev
-  +1: kkolinko, markt, rjung
-  -1:
 
   2) Add a new PrivilegedAction. Patch by markt
   http://svn.apache.org/viewvc?rev=834080&view=rev

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java?rev=900750&r1=900749&r2=900750&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
 Tue Jan 19 12:14:39 2010
@@ -71,7 +71,7 @@
  * Specialized web application class loader.
  * 
  * This class loader is a full reimplementation of the 
- * URLClassLoader from the JDK. It is desinged to be fully
+ * URLClassLoader from the JDK. It is designed to be fully
  * compatible with a normal URLClassLoader, although its internal
  * behavior may be completely different.
  * 
@@ -892,6 +892,8 @@
 throw cnfe;
 }
 } catch(AccessControlException ace) {
+log.warn("WebappClassLoader.findClassInternal(" + name
++ ") security exception: " + ace.getMessage(), ace);
 throw new ClassNotFoundException(name, ace);
 } catch (RuntimeException e) {
 if (log.isTraceEnabled())
@@ -904,6 +906,8 @@
 clazz = super.findClass(name);
 }
 } catch(AccessControlException ace) {
+log.warn("WebappClassLoader.findClassInternal(" + name
++ ") security exception: " + ace.getMessage(), 
ace);
 throw new ClassNotFoundException(name, ace);
 } catch (RuntimeException e) {
 if (log.isTraceEnabled())

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=900750&r1=900749&r2=900750&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue Jan 19 
12:14:39 2010
@@ -90,6 +90,10 @@
 47826: Correct error in debug message in
 org.apache.catalina.Bootstrap (markt)
   
+  
+48097: Make WebappClassLoader to do not swallow
+AccessControlException. (kkolinko)
+  
   
 Add an additional permission required by JULI when running under newer
 JDKs and a security manager. (markt)



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r900755 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java container/catalina/src/share/org/apache/catalina/security/Secu

2010-01-19 Thread kkolinko
Author: kkolinko
Date: Tue Jan 19 12:50:38 2010
New Revision: 900755

URL: http://svn.apache.org/viewvc?rev=900755&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48097
Avoid throwing an AccessControlException which can lead to a 
NoClassDefFoundError on first access of first jsp.

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/security/SecurityClassLoad.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=900755&r1=900754&r2=900755&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jan 19 12:50:38 2010
@@ -72,25 +72,6 @@
   )
 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48097
-  There are two patches to be applied:
-
-  2) Add a new PrivilegedAction. Patch by markt
-  http://svn.apache.org/viewvc?rev=834080&view=rev
-  +1: kkolinko, markt, rjung
-  -1:
-  rjung: minus generics
-
-  3) Remove use of WebappClassLoader$PrivilegedFindResource,
-  because all findResourceInternal(String,String) calls are now already
-  wrapped with AccessController.doPrivileged, so additional wrapping is not
-  needed. Add preloading of the new PrivilegedFindResourceByName class,
-  (to fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48097#c13
-  )
-  
http://people.apache.org/~kkolinko/patches/2009-11-12_PrivilegedFindResource_tc6.patch
-  +1: kkolinko, markt, rjung
-  -1:
-
 * Fix CVE-2009-3548 - Windows installer uses insecure default password
   http://svn.apache.org/viewvc?rev=834047&view=rev
   +1: markt, mturk

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java?rev=900755&r1=900754&r2=900755&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
 Tue Jan 19 12:50:38 2010
@@ -114,6 +114,9 @@
 public static final boolean ENABLE_CLEAR_REFERENCES = 
 
Boolean.valueOf(System.getProperty("org.apache.catalina.loader.WebappClassLoader.ENABLE_CLEAR_REFERENCES",
 "true")).booleanValue();
 
+/**
+ * @deprecated Not used
+ */
 protected class PrivilegedFindResource
 implements PrivilegedAction {
 
@@ -131,6 +134,23 @@
 
 }
 
+protected class PrivilegedFindResourceByName
+implements PrivilegedAction {
+
+protected String name;
+protected String path;
+
+PrivilegedFindResourceByName(String name, String path) {
+this.name = name;
+this.path = path;
+}
+
+public Object run() {
+return findResourceInternal(name, path);
+}
+
+}
+
 protected final class PrivilegedGetClassLoader
 implements PrivilegedAction {
 
@@ -961,7 +981,13 @@
 
 ResourceEntry entry = (ResourceEntry) resourceEntries.get(name);
 if (entry == null) {
-entry = findResourceInternal(name, name);
+if (securityManager != null) {
+PrivilegedAction dp =
+new PrivilegedFindResourceByName(name, name);
+entry = (ResourceEntry) AccessController.doPrivileged(dp);
+} else {
+entry = findResourceInternal(name, name);
+}
 }
 if (entry != null) {
 url = entry.source;
@@ -1844,7 +1870,13 @@
 
 ResourceEntry entry = null;
 
-entry = findResourceInternal(name, classPath);
+if (securityManager != null) {
+PrivilegedAction dp =
+new PrivilegedFindResourceByName(name, classPath);
+entry = (ResourceEntry) AccessController.doPrivileged(dp);
+} else {
+entry = findResourceInternal(name, classPath);
+}
 
 if (entry == null)
 throw new ClassNotFoundException(name);
@@ -1927,8 +1959,7 @@
 }
 
 /**
- * Find specified resource in local repositories. This block
- * will execute under an AccessControl.doPrivilege block.
+ * Find specified resource in local repositories.
  *
  * @return the loaded resource, or null if the resource isn't found
  */
@@ -1987,13 +2018,7 @@
 
 // Note : Not getting an exception here means the resource was
 // found
- if (securityManager != null) {
-

svn commit: r900759 - /tomcat/tc5.5.x/trunk/STATUS.txt

2010-01-19 Thread kkolinko
Author: kkolinko
Date: Tue Jan 19 13:04:32 2010
New Revision: 900759

URL: http://svn.apache.org/viewvc?rev=900759&view=rev
Log:
votes

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=900759&r1=900758&r2=900759&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jan 19 13:04:32 2010
@@ -139,7 +139,7 @@
   Correct file descriptor leak on context stop/reload
   Patch provided by George Sexton
   http://svn.apache.org/viewvc?rev=883130&view=rev
-  +1: markt, rjung
+  +1: markt, rjung, kkolinko
   -1: 
   
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47997
@@ -151,7 +151,7 @@
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47554
   httpOnly flag not applied to migrated session cookie
   http://svn.apache.org/viewvc?rev=891304&view=rev
-  +1: markt, rjung
+  +1: markt, rjung, kkolinko
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48049
@@ -183,13 +183,16 @@
   not change the session ID
   http://svn.apache.org/viewvc?rev=889716&view=rev
   +1: markt, rjung
+  +1: kkolinko: with r892415
   -1: 
   rjung: I'd prefer off by default, because 5.5 is assumed to be very stable,
   and changing by default can break things like e.g. existing profiles for
   automated stress testing.
+  kkolinko: I agree to have off by default
+
   Provide setter for the new AuthenticatorBase property
   http://svn.apache.org/viewvc?rev=892415&view=rev
-  +1: markt
+  +1: markt, kkolinko
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47689
@@ -201,7 +204,7 @@
 * Pre-load class required to obtain SSL key size if running under a security
   manager
   http://svn.apache.org/viewvc?rev=890349&view=rev
-  +1: markt, rjung
+  +1: markt, rjung, kkolinko
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47744



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r900768 - /tomcat/tc5.5.x/trunk/STATUS.txt

2010-01-19 Thread kkolinko
Author: kkolinko
Date: Tue Jan 19 13:22:24 2010
New Revision: 900768

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

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=900768&r1=900767&r2=900768&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jan 19 13:22:24 2010
@@ -53,8 +53,11 @@
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44041
   Threading issue in class loading (using Filip's suggestion)
   http://people.apache.org/~markt/patches/2009-11-18-bug44041.patch
-  +1: markt
+  +1: markt, kkolinko
   -1:
+   kkolinko: To reviewers: the patch looks scary, but the only thing it
+   actually does is to add "synchronized (name.intern()) {" around the
+   whole contents of the method.
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47878
   Return 404's rather than a permanent 500 if a JSP is deleted



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r900770 - /tomcat/tc6.0.x/trunk/build.properties.default

2010-01-19 Thread jfclere
Author: jfclere
Date: Tue Jan 19 13:24:49 2010
New Revision: 900770

URL: http://svn.apache.org/viewvc?rev=900770&view=rev
Log:
Ready for tagging 6.0.24

Modified:
tomcat/tc6.0.x/trunk/build.properties.default

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=900770&r1=900769&r2=900770&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Tue Jan 19 13:24:49 2010
@@ -29,7 +29,7 @@
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=-dev
+version=6.0.24
 
 # - Default Base Path for Dependent Packages -
 # Please note this path must be absolute, not relative,



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r900772 - /tomcat/tc6.0.x/tags/TOMCAT_6_0_24/

2010-01-19 Thread jfclere
Author: jfclere
Date: Tue Jan 19 13:26:02 2010
New Revision: 900772

URL: http://svn.apache.org/viewvc?rev=900772&view=rev
Log:
tag 6.0.24

Added:
tomcat/tc6.0.x/tags/TOMCAT_6_0_24/   (props changed)
  - copied from r900771, tomcat/tc6.0.x/trunk/

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_24/
--
--- svn:ignore (added)
+++ svn:ignore Tue Jan 19 13:26:02 2010
@@ -0,0 +1,3 @@
+output
+.settings
+build.properties

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_24/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 19 13:26:02 2010
@@ -0,0 +1,2 @@
+/tomcat:883362
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77
 
0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,8902
 
65,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,899284,899348,899420



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r900787 - /tomcat/tc6.0.x/trunk/build.properties.default

2010-01-19 Thread jfclere
Author: jfclere
Date: Tue Jan 19 14:11:05 2010
New Revision: 900787

URL: http://svn.apache.org/viewvc?rev=900787&view=rev
Log:
Rollback r900770 (it is in the tag now).

Modified:
tomcat/tc6.0.x/trunk/build.properties.default

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=900787&r1=900786&r2=900787&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Tue Jan 19 14:11:05 2010
@@ -29,7 +29,7 @@
 version.minor=0
 version.build=0
 version.patch=0
-version=6.0.24
+version.suffix=-dev
 
 # - Default Base Path for Dependent Packages -
 # Please note this path must be absolute, not relative,



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[VOTE] Release build 6.0.24

2010-01-19 Thread jean-frederic clere
The candidates binaries are available here:
http://people.apache.org/~jfclere/tomcat-6/v6.0.24/

According to the release process, the 6.0.24 tag is:
[ ] Broken
[ ] Alpha
[ ] Beta
[ ] Stable

Cheers

Jean-Frederic

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Tomcat Realm

2010-01-19 Thread Aihong Yin

Hi,

I'm using tomcat5.5 and my question is:
is it possible to implement a realm to identify valid users of a web 
application: the username and password get from LDAP directory server 
central, and the role of the user get from a local file such as 
tomcat-user.xml without pasword instead.


best regards,
Aihong Yin.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: trimSpaces

2010-01-19 Thread Mark Thomas
On 19/01/2010 05:05, Kevin Jackson wrote:
> Hi,
> 
> https://issues.apache.org/bugzilla/show_bug.cgi?id=45931
> 
> This fix would be very beneficial for us, although I'm aware that the
> addition of this would make an application deployed in tomcat emit
> different output than an app deployed on say jetty.
> 
> I'm willing to merge this with the trunk (for tomcat7) if people's
> time is a factor and to test it.

Certainly, the first place this will be committed will be trunk. A patch
against trunk will make this easier.

I have only glanced at the patch. The one thing I did notice was that it
needs to include updates to the documentation.

I'd be willing to review a patch for trunk and commit it if appropriate.

Mark



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: Tomcat Realm

2010-01-19 Thread Mark Thomas
On 19/01/2010 09:30, Aihong Yin wrote:
> Hi,
> 
> I'm using tomcat5.5 and my question is:
> is it possible to implement a realm to identify valid users of a web
> application: the username and password get from LDAP directory server
> central, and the role of the user get from a local file such as
> tomcat-user.xml without pasword instead.

That is a question for the users list.

Mark



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [VOTE] Release build 6.0.24

2010-01-19 Thread Mark Thomas
On 19/01/2010 09:25, jean-frederic clere wrote:
> The candidates binaries are available here:
> http://people.apache.org/~jfclere/tomcat-6/v6.0.24/
> 
> According to the release process, the 6.0.24 tag is:
> [ ] Broken
> [ ] Alpha
> [ ] Beta
> [X] Stable

Checked:
-src.zip
-src.tar.gz
.exe
.zip
.tar.gz
-windows-x86.zip
-fulldocs.tar.gz

MD5s OK
Signatures OK
Key in web of trust

.exe
 - installer works on 32-bit windows - good
 - logs not lost on shutdown - good
 - correct native library used   - good
 - conf files have LF line-endings   - minor - same as 6.0.20

-src.zip
 - *.java files have CRLF endings- good
 - conf files have CRLF endings  - good
 - contents agrees with tag  - good

-src.tar.gz
 - *.java files have LF endings  - good
 - conf files have LF endings- good
 - contents agree with -src.zip  - good
   (except line endings)

.zip
 - conf files have CRLF endings  - good
 - .bat files have CRLF endings  - good
 - .sh files have LF endings - good
 - other text files have LF endings  - minor - same as 6.0.20
 - runs on 32-bit windows- good

.tar.gz
 - conf files have LF endings- good
 - .bat files have CRLF endings  - good
 - .sh files have LF endings - good
 - other text files have LF endings  - good
 - runs on OSX 10.5.8- good
 - Servlet 2.5 TCK passes- good
 - Servlet 2.5 TCK passes with SM*   - good
 - JSP 2.1 TCK passes- good
 - JSP 2.1 TCK passes with SM- good

* There are 5 failures, all expected since the tests try to make network
connections which are prevented by the security manager

The minor line-ending issues we a) know about and b) were in 6.0.20 so I
do not see these as show stoppers.

Mark



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r900980 - /tomcat/trunk/modules/tomcat-lite/.classpath

2010-01-19 Thread costin
Author: costin
Date: Tue Jan 19 22:18:56 2010
New Revision: 900980

URL: http://svn.apache.org/viewvc?rev=900980&view=rev
Log:
Fix local source paths, accidental commit.


Modified:
tomcat/trunk/modules/tomcat-lite/.classpath

Modified: tomcat/trunk/modules/tomcat-lite/.classpath
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/.classpath?rev=900980&r1=900979&r2=900980&view=diff
==
--- tomcat/trunk/modules/tomcat-lite/.classpath (original)
+++ tomcat/trunk/modules/tomcat-lite/.classpath Tue Jan 19 22:18:56 2010
@@ -11,7 +11,7 @@



-   
+   



@@ -19,7 +19,7 @@



-   
-   
+   
+   

 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r901014 - /tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/jmx/JmxObjectManagerSpi.java

2010-01-19 Thread costin
Author: costin
Date: Wed Jan 20 00:23:10 2010
New Revision: 901014

URL: http://svn.apache.org/viewvc?rev=901014&view=rev
Log:
Wrong method name for modeler.


Modified:

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/jmx/JmxObjectManagerSpi.java

Modified: 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/jmx/JmxObjectManagerSpi.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/jmx/JmxObjectManagerSpi.java?rev=901014&r1=901013&r2=901014&view=diff
==
--- 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/jmx/JmxObjectManagerSpi.java
 (original)
+++ 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/jmx/JmxObjectManagerSpi.java
 Wed Jan 20 00:23:10 2010
@@ -34,7 +34,7 @@
 
 public JmxObjectManagerSpi() {
 registry = Registry.getRegistry(null, null);
-registry.setServer(ManagementFactory.getPlatformMBeanServer());
+registry.setMBeanServer(ManagementFactory.getPlatformMBeanServer());
 }
 
 public void bind(String name, Object o) {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: native-doc part of Tomcat site: outdated?

2010-01-19 Thread denny joseph
Hi,

Could someone suggest me a bug on tomcat 7.0/tomcat 6.0 which i can start
working on? I have set up the build env for Tomcat 7 and would like to start
contributing something.

I have about 8 years exp in java...

Thanks
Denny


Re: native-doc part of Tomcat site: outdated?

2010-01-19 Thread Mark Thomas
On 19/01/2010 20:11, denny joseph wrote:
> Hi,
> 
> Could someone suggest me a bug on tomcat 7.0/tomcat 6.0 which i can start
> working on? I have set up the build env for Tomcat 7 and would like to start
> contributing something.
> 
> I have about 8 years exp in java...

Great - welcome, but please don't hi-jack threads. If you want to start
a discussion on a new subject, create a new message. Don't reply to an
unrelated message on the list.

Take a look at the JspC bug
https://issues.apache.org/bugzilla/show_bug.cgi?id=48371

On the face of it, it looks like JspC just needs to respect comments but
that might just be symptomatic of a wider parsing issue when determining
the insertion point.

If you have any questions, just ask them on the list. I wouldn't add
anything to the bugzilla entry unless it contributes to move the bug
towards a solution (ie a patch, a question for the OP etc).

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org