svn commit: r1059811 - /tomcat/trunk/webapps/docs/config/context.xml

2011-01-17 Thread kkolinko 
Author: kkolinko
Date: Mon Jan 17 08:27:00 2011
New Revision: 1059811

URL: http://svn.apache.org/viewvc?rev=1059811view=rev
Log:
Clarify web application version ordering rules when both versioned and 
non-versioned instances of the application are running in parallel.

Modified:
tomcat/trunk/webapps/docs/config/context.xml

Modified: tomcat/trunk/webapps/docs/config/context.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=1059811r1=1059810r2=1059811view=diff
==
--- tomcat/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/trunk/webapps/docs/config/context.xml Mon Jan 17 08:27:00 2011
@@ -35,13 +35,13 @@
 
 section name=Introduction
 
-blockquoteem
-pThe description below uses the variable name $CATALINA_BASE to refer the
+blockquotepem
+The description below uses the variable name $CATALINA_BASE to refer the
 base directory against which most relative paths are resolved. If you have
 not configured Tomcat for multiple instances by setting a CATALINA_BASE
 directory, then $CATALINA_BASE will be set to the value of $CATALINA_HOME,
-the directory into which you have installed Tomcat./p
-/em/blockquote
+the directory into which you have installed Tomcat.
+/em/p/blockquote
 
   pThe strongContext/strong element represents a emweb
   application/em, which is run within a particular virtual host.
@@ -68,8 +68,8 @@
   web application for this virtual host, and is used to process all
   requests that do not match any other Context's context path./p
 
-  pYou may deploy multiple versions of a web application with the same 
context
-  path at the same time. The rules used to match requests to a context version
+  pbYou may deploy multiple versions of a web application with the same 
context
+  path at the same time./b The rules used to match requests to a context 
version
   are as follows:
   ul
   liIf no session information is present in the request, use the latest
@@ -93,7 +93,7 @@
 contextPath with the leading '/' removed and any remaining '/'
 characters in the path replaced with '#'./li
   /ul
-  When a version is specified, ##version is added to the contextName and base
+  When a version is specified, code##version/code is added to the 
contextName and base
   name. To help clarify these rules, some examples are given in the following
   table./p
   
@@ -109,7 +109,11 @@
   
   pThe version component is treated as a codeString/code both for
   performance reasons and to allow flexibility in versioning schemes. String
-  comparissions are used to determine version order. Therefore
+  comparisons are used to determine version order. If version is not specified,
+  it is treated as the empty string.
+  Therefore,
+  codefoo.war/code will be treated as an earlier version than
+  codefoo##11.war/code and
   codefoo##11.war/code will be treated as an earlier version than
   codefoo##2.war/code. If using a purely numerical versioning scheme it is
   recommended that zero padding is used so that codefoo##002.war/code is



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

svn commit: r1059827 - in /tomcat/tc6.0.x/trunk/webapps/docs/config: context.xml engine.xml host.xml

2011-01-17 Thread kkolinko 
Author: kkolinko
Date: Mon Jan 17 09:29:13 2011
New Revision: 1059827

URL: http://svn.apache.org/viewvc?rev=1059827view=rev
Log:
Update examples of configurations of RemoteAddrValve, RemoteHostValve
We are using java.util.regex, not Jakarta regex.
CTR (docs)

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/engine.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml?rev=1059827r1=1059826r2=1059827view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml Mon Jan 17 09:29:13 
2011
@@ -730,9 +730,8 @@
 a href=engine.htmlEngine/a, a href=host.htmlHost/a, or
 a href=context.htmlContext/a element.  The remote address or name
 will be checked against a configured list of accept and/or deny
-filters, which are defined using the Regular Expression syntax supported
-by the a href=http://jakarta.apache.org/regexp/;Jakarta Regexp/a
-regular expression library.  Requests that come from locations that are
+filters, which are defined using codejava.util.regex/code Regular
+Expression syntax.  Requests that come from locations that are
 not accepted will be rejected with an HTTP Forbidden error.
 Example filter declarations:/p
 
@@ -740,9 +739,9 @@
 lt;Context path=/examples ...gt;
   ...
   lt;Valve className=org.apache.catalina.valves.RemoteHostValve
- allow=*.mycompany.com,www.yourcompany.com/gt;
+ allow=.*\.mycompany\.com|www\.yourcompany\.com/gt;
   lt;Valve className=org.apache.catalina.valves.RemoteAddrValve
- deny=192.168.1.*/gt;
+ deny=192\.168\.1\.\d+/gt;
   ...
 lt;/Contextgt;
 /source

Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/engine.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/engine.xml?rev=1059827r1=1059826r2=1059827view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/engine.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/engine.xml Mon Jan 17 09:29:13 2011
@@ -225,9 +225,8 @@
 a href=engine.htmlEngine/a, a href=host.htmlHost/a, or
 a href=context.htmlContext/a element.  The remote address or name
 will be checked against a configured list of accept and/or deny
-filters, which are defined using the Regular Expression syntax supported
-by the a href=http://jakarta.apache.org/regexp/;Jakarta Regexp/a
-regular expression library.  Requests that come from locations that are
+filters, which are defined using codejava.util.regex/code Regular
+Expression syntax.  Requests that come from locations that are
 not accepted will be rejected with an HTTP Forbidden error.
 Example filter declarations:/p
 
@@ -235,9 +234,9 @@
 lt;Engine name=Standalone ...gt;
   ...
   lt;Valve className=org.apache.catalina.valves.RemoteHostValve
- allow=*.mycompany.com,www.yourcompany.com/gt;
+ allow=.*\.mycompany\.com|www\.yourcompany\.com/gt;
   lt;Valve className=org.apache.catalina.valves.RemoteAddrValve
- deny=192.168.1.*/gt;
+ deny=192\.168\.1\.\d+/gt;
   ...
 lt;/Enginegt;
 /source

Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml?rev=1059827r1=1059826r2=1059827view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml Mon Jan 17 09:29:13 2011
@@ -471,9 +471,8 @@
 a href=engine.htmlEngine/a, a href=host.htmlHost/a, or
 a href=context.htmlContext/a element.  The remote address or name
 will be checked against a configured list of accept and/or deny
-filters, which are defined using the Regular Expression syntax supported
-by the a href=http://jakarta.apache.org/regexp/;Jakarta Regexp/a
-regular expression library.  Requests that come from locations that are
+filters, which are defined using codejava.util.regex/code Regular
+Expression syntax.  Requests that come from locations that are
 not accepted will be rejected with an HTTP Forbidden error.
 Example filter declarations:/p
 
@@ -481,9 +480,9 @@
 lt;Host name=localhost ...gt;
   ...
   lt;Valve className=org.apache.catalina.valves.RemoteHostValve
- allow=*.mycompany.com,www.yourcompany.com/gt;
+ allow=.*\.mycompany\.com|www\.yourcompany\.com/gt;
   lt;Valve className=org.apache.catalina.valves.RemoteAddrValve
- deny=192.168.1.*/gt;
+ deny=192\.168\.1\.\d+/gt;
   ...
 lt;/Hostgt;
 /source

svn commit: r1059836 - in /tomcat/tc5.5.x/trunk/container/webapps: admin/admin.xml docs/config/context.xml docs/config/engine.xml docs/config/host.xml

2011-01-17 Thread kkolinko 
Author: kkolinko
Date: Mon Jan 17 09:49:55 2011
New Revision: 1059836

URL: http://svn.apache.org/viewvc?rev=1059836view=rev
Log:
Update examples of configurations of RemoteAddrValve, RemoteHostValve
We are using java.util.regex, not Jakarta regexp.
CTR (docs)

Modified:
tomcat/tc5.5.x/trunk/container/webapps/admin/admin.xml
tomcat/tc5.5.x/trunk/container/webapps/docs/config/context.xml
tomcat/tc5.5.x/trunk/container/webapps/docs/config/engine.xml
tomcat/tc5.5.x/trunk/container/webapps/docs/config/host.xml

Modified: tomcat/tc5.5.x/trunk/container/webapps/admin/admin.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/admin/admin.xml?rev=1059836r1=1059835r2=1059836view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/admin/admin.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/admin/admin.xml Mon Jan 17 09:49:55 
2011
@@ -28,10 +28,10 @@
  antiResourceLocking=false antiJARLocking=false
 
   !-- Uncomment this Valve to limit access to the Admin app to localhost
-   for obvious security reasons. Allow may be a comma-separated list of
-   hosts (or even regular expressions).
+   for obvious security reasons. Allow is a comma-separated list of
+   regular expressions using java.util.regex syntax.
   Valve className=org.apache.catalina.valves.RemoteAddrValve
-allow=127.0.0.1/
+allow=127\.0\.0\.1/
   --
 
 /Context

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/config/context.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/config/context.xml?rev=1059836r1=1059835r2=1059836view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/config/context.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/config/context.xml Mon Jan 17 
09:49:55 2011
@@ -665,9 +665,8 @@
 a href=engine.htmlEngine/a, a href=host.htmlHost/a, or
 a href=context.htmlContext/a element.  The remote address or name
 will be checked against a configured list of accept and/or deny
-filters, which are defined using the Regular Expression syntax supported
-by the a href=http://jakarta.apache.org/regexp/;Jakarta Regexp/a
-regular expression library.  Requests that come from locations that are
+filters, which are defined using codejava.util.regex/code Regular
+Expression syntax.  Requests that come from locations that are
 not accepted will be rejected with an HTTP Forbidden error.
 Example filter declarations:/p
 
@@ -675,9 +674,9 @@
 lt;Context path=/examples ...gt;
   ...
   lt;Valve className=org.apache.catalina.valves.RemoteHostValve
- allow=*.mycompany.com,www.yourcompany.com/gt;
+ allow=.*\.mycompany\.com|www\.yourcompany\.com/gt;
   lt;Valve className=org.apache.catalina.valves.RemoteAddrValve
- deny=192.168.1.*/gt;
+ deny=192\.168\.1\.\d+/gt;
   ...
 lt;/Contextgt;
 /source

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/config/engine.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/config/engine.xml?rev=1059836r1=1059835r2=1059836view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/config/engine.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/config/engine.xml Mon Jan 17 
09:49:55 2011
@@ -225,9 +225,8 @@
 a href=engine.htmlEngine/a, a href=host.htmlHost/a, or
 a href=context.htmlContext/a element.  The remote address or name
 will be checked against a configured list of accept and/or deny
-filters, which are defined using the Regular Expression syntax supported
-by the a href=http://jakarta.apache.org/regexp/;Jakarta Regexp/a
-regular expression library.  Requests that come from locations that are
+filters, which are defined using codejava.util.regex/code Regular
+Expression syntax.  Requests that come from locations that are
 not accepted will be rejected with an HTTP Forbidden error.
 Example filter declarations:/p
 
@@ -235,9 +234,9 @@
 lt;Engine name=Standalone ...gt;
   ...
   lt;Valve className=org.apache.catalina.valves.RemoteHostValve
- allow=*.mycompany.com,www.yourcompany.com/gt;
+ allow=.*\.mycompany\.com|www\.yourcompany\.com/gt;
   lt;Valve className=org.apache.catalina.valves.RemoteAddrValve
- deny=192.168.1.*/gt;
+ deny=192\.168\.1\.\d+/gt;
   ...
 lt;/Enginegt;
 /source

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/config/host.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/config/host.xml?rev=1059836r1=1059835r2=1059836view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/config/host.xml (original)
+++

[Tomcat Wiki] Update of PoweredBy by prosch

2011-01-17 Thread Apache Wiki 
Dear Wiki user,

You have subscribed to a wiki page or wiki category on Tomcat Wiki for change 
notification.

The PoweredBy page has been changed by prosch.
http://wiki.apache.org/tomcat/PoweredBy?action=diffrev1=290rev2=291

--

  = Sites, Applications, and Systems that are Powered By Tomcat =
  This page is a list of some, in all likelihood a very small fraction 
actually, of the sites out there that use [[http://tomcat.apache.org|Apache 
Tomcat]] in production.  For security and other policy-related reasons, many 
organizations choose not to disclose the server they use.  Tomcat has been 
downloaded more than 10 million times: assuming even a 1% production adoption 
rate results in more than 10 installations.  As an aside for the curious, 
you can see recent Tomcat download statistics on 
[[http://people.apache.org/~vgritsenko/stats/projects/tomcat.html|Vadim 
Gritsenko's page]].  Note, however, that these represent downloads from 
apache.org servers only, and not from mirrors, so they are likely to represent 
only a small minority of downloads: the total number is much (more than an 
order of magnitude) greater.  Companies that support Tomcat, such as 
[[http://www.springsource.com|SpringSource]] claim more than half of the global 
Fortune 500 as their clients.
  
- This page is organized by categories: [[#pub|sites with publications]], 
[[#user|sites added by users]], [[#surveys|independent surveys]], and 
[[#more|more]].  Anyone can and is encouraged to add to this page: please add 
your site, application, or system as you see fit.  You do need to register with 
the Apache wiki system to edit this page: simply click the login or user 
preferences links at the top right of your screen to do so.  Don't worry if you 
don't think it fits here or into any particular category: we would like to see 
your application listed no matter how big, how small, or how miscategorized ;)  
Some of these applications are simply compatible with, ship with, or run on 
Tomcat.  Others are specifically designed or documented with Tomcat as the 
container in mind.
+ This page is organized by categories: [[#pub|sites with publications]], 
[[#user|sites added by users]], [[#surveys|independent surveys]], and 
[[#more|more]].  Anyone can and is encouraged to add to this page: please add 
your site, application, or system as you see fit.  You do need to register with 
the Apache wiki system to edit this page: simply click the login or user 
preferences links at the top right of your screen to do so.  Don't worry if you 
don't think it fits here or into any particular category: we would like to see 
your application listed no matter how big, how small, or how miscategorized ;)  
Some of these applications are simply compatible with, ship with, or run on 
Tomcat.  Others are specifically designed or documented with Tomcat as the 
container in mind. [[http://www.profischnell.com|Express Übersetzung]] 
[[http://www.profischnell.com/uebersetzungsbuero/dolmetscher.html|Dolmetschen]] 
[[http://www.profischnell.com|Eilübersetzung]] 
  
  Please note that all the corporate logos and names used below are trademarked 
by their respective organizations.  These organizations are not affiliated with 
this web site or with The Apache Software Foundation, and make no claims 
regarding The Foundation or its products.  Further, in most cases the companies 
are not aware of their being listed on this site at all.
  

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

PoweredBy reverted to revision 290 on Tomcat Wiki

2011-01-17 Thread Apache Wiki 
Dear wiki user,

You have subscribed to a wiki page Tomcat Wiki for change notification.

The page PoweredBy has been reverted to revision 290 by KonstantinKolinko.
The comment on this change is: Reverted to r290 to remove spam.
http://wiki.apache.org/tomcat/PoweredBy?action=diffrev1=291rev2=292

--

  = Sites, Applications, and Systems that are Powered By Tomcat =
  This page is a list of some, in all likelihood a very small fraction 
actually, of the sites out there that use [[http://tomcat.apache.org|Apache 
Tomcat]] in production.  For security and other policy-related reasons, many 
organizations choose not to disclose the server they use.  Tomcat has been 
downloaded more than 10 million times: assuming even a 1% production adoption 
rate results in more than 10 installations.  As an aside for the curious, 
you can see recent Tomcat download statistics on 
[[http://people.apache.org/~vgritsenko/stats/projects/tomcat.html|Vadim 
Gritsenko's page]].  Note, however, that these represent downloads from 
apache.org servers only, and not from mirrors, so they are likely to represent 
only a small minority of downloads: the total number is much (more than an 
order of magnitude) greater.  Companies that support Tomcat, such as 
[[http://www.springsource.com|SpringSource]] claim more than half of the global 
Fortune 500 as their clients.
  
- This page is organized by categories: [[#pub|sites with publications]], 
[[#user|sites added by users]], [[#surveys|independent surveys]], and 
[[#more|more]].  Anyone can and is encouraged to add to this page: please add 
your site, application, or system as you see fit.  You do need to register with 
the Apache wiki system to edit this page: simply click the login or user 
preferences links at the top right of your screen to do so.  Don't worry if you 
don't think it fits here or into any particular category: we would like to see 
your application listed no matter how big, how small, or how miscategorized ;)  
Some of these applications are simply compatible with, ship with, or run on 
Tomcat.  Others are specifically designed or documented with Tomcat as the 
container in mind. [[http://www.profischnell.com|Express Übersetzung]] 
[[http://www.profischnell.com/uebersetzungsbuero/dolmetscher.html|Dolmetschen]] 
[[http://www.profischnell.com|Eilübersetzung]] 
+ This page is organized by categories: [[#pub|sites with publications]], 
[[#user|sites added by users]], [[#surveys|independent surveys]], and 
[[#more|more]].  Anyone can and is encouraged to add to this page: please add 
your site, application, or system as you see fit.  You do need to register with 
the Apache wiki system to edit this page: simply click the login or user 
preferences links at the top right of your screen to do so.  Don't worry if you 
don't think it fits here or into any particular category: we would like to see 
your application listed no matter how big, how small, or how miscategorized ;)  
Some of these applications are simply compatible with, ship with, or run on 
Tomcat.  Others are specifically designed or documented with Tomcat as the 
container in mind.
  
  Please note that all the corporate logos and names used below are trademarked 
by their respective organizations.  These organizations are not affiliated with 
this web site or with The Apache Software Foundation, and make no claims 
regarding The Foundation or its products.  Further, in most cases the companies 
are not aware of their being listed on this site at all.
  

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

DO NOT REPLY [Bug 50600] New: ConcurrentModificationException removing WAR via FarmWarDeployer

2011-01-17 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=50600

   Summary: ConcurrentModificationException removing WAR via
FarmWarDeployer
   Product: Tomcat 6
   Version: 6.0.29
  Platform: All
OS/Version: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Cluster
AssignedTo: dev@tomcat.apache.org
ReportedBy: ma...@apache.org


The following exception was reported via $work

WARNING: Exception processing cluster
org.apache.catalina.ha.tcp.SimpleTcpCluster@68e4e358 background process
java.util.ConcurrentModificationException
at java.util.HashMap$HashIterator.nextEntry(HashMap.java:810)
at java.util.HashMap$EntryIterator.next(HashMap.java:851)
at java.util.HashMap$EntryIterator.next(HashMap.java:849)
at org.apache.catalina.ha.deploy.WarWatcher.check(WarWatcher.java:87)
at
org.apache.catalina.ha.deploy.FarmWarDeployer.backgroundProcess(FarmWarDeployer.java:609)
at
org.apache.catalina.ha.tcp.SimpleTcpCluster.backgroundProcess(SimpleTcpCluster.java:596)
at
org.apache.catalina.core.ContainerBase.backgroundProcess(ContainerBase.java:1302)
at
org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.processChildren(ContainerBase.java:1601)
at
org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.processChildren(ContainerBase.java:1610)
at
org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1590)
at java.lang.Thread.run(Thread.java:636)

The root cause is removing the entry directly from the Map rather than from the
iterator. I have a patch that I'll apply shortly.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

svn commit: r1059881 - in /tomcat/trunk: java/org/apache/catalina/ha/deploy/WarWatcher.java webapps/docs/changelog.xml

2011-01-17 Thread markt 
Author: markt
Date: Mon Jan 17 11:26:56 2011
New Revision: 1059881

URL: http://svn.apache.org/viewvc?rev=1059881view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50600
Prevent ConcurrentModificationException when removing WAR via FarmWarDeployer 

Modified:
tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java?rev=1059881r1=1059880r2=1059881view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java Mon Jan 17 
11:26:56 2011
@@ -96,7 +96,7 @@ public class WarWatcher {
 } else if (check == -1) {
 listener.fileRemoved(info.getWar());
 //no need to keep in memory
-currentStatus.remove(info.getWar().getAbsolutePath());
+i.remove();
 }
 }
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1059881r1=1059880r2=1059881view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jan 17 11:26:56 2011
@@ -93,6 +93,10 @@
   add
 Internationalise the log messages for the FarmWarDeployer. (markt)
   /add
+  fix
+bug50600/bug: Prevent a 
codeConcurrentModificationException/code
+when removing a WAR file via the FarmWarDeployer. (markt)
+  /fix
 /changelog
   /subsection
   subsection name=Web applications



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

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

2011-01-17 Thread markt 
Author: markt
Date: Mon Jan 17 11:28:03 2011
New Revision: 1059882

URL: http://svn.apache.org/viewvc?rev=1059882view=rev
Log:
Proposal

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=1059882r1=1059881r2=1059882view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 17 11:28:03 2011
@@ -152,3 +152,11 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=1057275view=rev
   +1: markt
   -1:
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50600
+  Avoid ConcurrentModificationException when removing WAR via FarmWarDeployer
+  http://svn.apache.org/viewvc?rev=1059881view=rev
+  +1: markt
+  -1:
+
+  
\ No newline at end of file



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

DO NOT REPLY [Bug 50600] ConcurrentModificationException removing WAR via FarmWarDeployer

2011-01-17 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=50600

--- Comment #1 from Mark Thomas ma...@apache.org 2011-01-17 06:28:46 EST ---
Fixed in 7.0.x and will be included in 7.0.7 onwards - r1059881

Proposed for 6.0.x

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

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

2011-01-17 Thread rjung 
Author: rjung
Date: Mon Jan 17 11:53:52 2011
New Revision: 1059896

URL: http://svn.apache.org/viewvc?rev=1059896view=rev
Log:
Patch provided, thanks.

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=1059896r1=1059895r2=1059896view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Jan 17 11:53:52 2011
@@ -90,8 +90,6 @@ PATCHES PROPOSED TO BACKPORT:
   https://issues.apache.org/bugzilla/attachment.cgi?id=26482 (patch against 
tc5.5)
   +1: kfujino
   -1:
-  rjung: Please provide a patch that applies cleanly to both DeltaManager
-  classes in TC 5.5.
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50550
   Requests for a newly created directory using MKCOL should not result in a 404



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

svn commit: r1059897 - /tomcat/trunk/webapps/docs/config/http.xml

2011-01-17 Thread kkolinko 
Author: kkolinko
Date: Mon Jan 17 11:55:58 2011
New Revision: 1059897

URL: http://svn.apache.org/viewvc?rev=1059897view=rev
Log:
Document the conflict between compression and sendfile,
as was discussed on users@
http://markmail.org/thread/bp46zusxjsqqxydr

Modified:
tomcat/trunk/webapps/docs/config/http.xml

Modified: tomcat/trunk/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1059897r1=1059896r2=1059897view=diff
==
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Mon Jan 17 11:55:58 2011
@@ -288,6 +288,18 @@
   the content-length is not known and compression is set to on or more
   aggressive, the output will also be compressed. If not specified, this
   attribute is set to off./p
+  pemNote/em: There is a tradeoff between using compression (saving
+  your bandwidth) and using the sendfile feature (saving your CPU cycles).
+  If the connector supports the sendfile feature, e.g. the NIO connector,
+  using sendfile will take precedence over compression. The symptoms will
+  be that static files greater that 48 Kb will be sent uncompressed.
+  You can turn off sendfile by setting codeuseSendfile/code attribute
+  of the connector, as documented below, or change the sendfile usage
+  threshold in the configuration of the
+  a href=../default-servlet.htmlDefaultServlet/a in the default
+  codeconf/web.xml/code or in the codeweb.xml/code of your web
+  application.
+  /p
 /attribute
 
 attribute name=compressionMinSize required=false



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

svn commit: r1059898 - /tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml

2011-01-17 Thread kkolinko 
Author: kkolinko
Date: Mon Jan 17 12:00:40 2011
New Revision: 1059898

URL: http://svn.apache.org/viewvc?rev=1059898view=rev
Log:
Document the conflict between compression and sendfile,
as was discussed on users@
http://markmail.org/thread/bp46zusxjsqqxydr
CTR (docs)

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

Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml?rev=1059898r1=1059897r2=1059898view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml Mon Jan 17 12:00:40 2011
@@ -276,6 +276,18 @@
   the content-length is not known and compression is set to on or more
   aggressive, the output will also be compressed. If not specified, this
   attribute is set to off./p
+  pemNote/em: There is a tradeoff between using compression (saving
+  your bandwidth) and using the sendfile feature (saving your CPU cycles).
+  If the connector supports the sendfile feature, e.g. the NIO connector,
+  using sendfile will take precedence over compression. The symptoms will
+  be that static files greater that 48 Kb will be sent uncompressed.
+  You can turn off sendfile by setting codeuseSendfile/code attribute
+  of the connector, as documented below, or change the sendfile usage
+  threshold in the configuration of the
+  a href=../default-servlet.htmlDefaultServlet/a in the default
+  codeconf/web.xml/code or in the codeweb.xml/code of your web
+  application.
+  /p
 /attribute
 
 attribute name=connectionLinger required=false



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

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

2011-01-17 Thread kkolinko 
Author: kkolinko
Date: Mon Jan 17 12:24:56 2011
New Revision: 1059900

URL: http://svn.apache.org/viewvc?rev=1059900view=rev
Log:
vote and proposal

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=1059900r1=1059899r2=1059900view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 17 12:24:56 2011
@@ -153,10 +153,15 @@ PATCHES PROPOSED TO BACKPORT:
   +1: markt
   -1:
 
+  Updated patch (merge of revs.1057275,1057788,1057990):
+  http://people.apache.org/~kkolinko/patches/2011-01-17_tc6_50205.patch
+  +1: kkolinko
+  -1:
+
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50600
   Avoid ConcurrentModificationException when removing WAR via FarmWarDeployer
   http://svn.apache.org/viewvc?rev=1059881view=rev
-  +1: markt
+  +1: markt, kkolinko
   -1:
 
   
\ No newline at end of file



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

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

2011-01-17 Thread kkolinko 
Author: kkolinko
Date: Mon Jan 17 13:02:29 2011
New Revision: 1059906

URL: http://svn.apache.org/viewvc?rev=1059906view=rev
Log:
Updated the patch - added r1038975,
and rephrased the proposal.

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=1059906r1=1059905r2=1059906view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Jan 17 13:02:29 2011
@@ -43,17 +43,17 @@ PATCHES PROPOSED TO BACKPORT:
   -1:
 
 * Backport Windows installer improvements from Tomcat 7.0.5.
+  (as applied to TC6 in http://svn.apache.org/viewvc?rev=1056426view=rev )
 
-  See TC 6 proposal for details (r1035106).
-  TC5.5 proposal is different in the following:
-   - Patch includes changes to build.xml, to implement filtering for @YEAR@
-   - Patch includes changes to tomcat-users_1.xml, to implement TC6/TC7
+  TC5.5 differences from TC6:
+   1) The patch includes changes to build.xml, to implement filtering for 
@YEAR@
+   2) The patch includes changes to tomcat-users_1.xml, to implement TC6/TC7
installer feature that the character encoding that was used to write
-   tomcat-users.xml is included in the XML signature that is printed
-   at the top of the file. That was to support non-latin usernames.
-   - TC5.5 uses the old roles manager and admin, instead of the newer
-   -gui ones.
+   tomcat-users.xml is included in the XML signature at the top of the file.
+   That is to support non-latin usernames.
+   3) The patch uses the old roles manager and admin, not the -gui ones.
 
+  To apply:
   1. Run the following SVN commands:
svn del build/resources/jvm.ini
svn del build/resources/config.ini
@@ -63,14 +63,13 @@ PATCHES PROPOSED TO BACKPORT:
svn copy ../../trunk/res/main.ico build/resources/
svn copy ../../trunk/res/uninst.ico build/resources/
   2. Apply patch:
-   http://people.apache.org/~kkolinko/patches/2010-11-15_tc55_tomcat-nsi.patch
-  (
-   For reference: here is the diff of tomcat.nsi of trunk @1035132 if I copy
-   this patched tc5.5 version on top of it:
-   
http://people.apache.org/~kkolinko/patches/2010-11-15_tc55_tomcat-nsi-of-tc7_vs_tc55.diff
-  )
-   +1: kkolinko - with r1038975 to remove use of PID file
-   -1:
+   http://people.apache.org/~kkolinko/patches/2011-01-17_tc55_tomcat-nsi.patch
+  +1: kkolinko
+  -1:
+
+   For reference: here is the diff of tomcat.nsi of trunk @1059900 if I copy
+   patched tomcat.nsi of tc5.5 on top of it:
+   (  
http://people.apache.org/~kkolinko/patches/2011-01-17_tc55_tomcat-nsi-of-tc7_vs_tc55.diff
 )
 
 * Configure manager, host-manager and admin webapps to use HttpOnly for 
session cookies
   http://people.apache.org/~kkolinko/patches/2010-11-22_tc55_httpOnly.patch



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

Findbugs Ant build target?

2011-01-17 Thread sebb 
Is there an Ant build target for running Findbugs on Tomcat trunk?

If not, would you consider adding one (I can provide a patch, but I
don't know all the settings, so some might have to be adjusted later)?

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

DO NOT REPLY [Bug 50601] New: Redundant null checks before instanceof in equals()

2011-01-17 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=50601

   Summary: Redundant null checks before instanceof in equals()
   Product: Tomcat 7
   Version: trunk
  Platform: All
OS/Version: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: s...@apache.org


Created an attachment (id=26497)
 -- (https://issues.apache.org/bugzilla/attachment.cgi?id=26497)
Patch to remove null checks

There are several instances of the following code in equals methods:

if (obj == null) return false;
if (!(obj instanceof SomeClass)) return false;

The null check is redundant, as null will fail the instanceof check.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

Time for 5.5.32??

2011-01-17 Thread Jim Jagielski 
I'd like to look over the remaining STATUS of 5.5 in hopes of
getting a 5.5.32 out soon... I'll RM.

Comments?

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

Re: Time for 5.5.32??

2011-01-17 Thread Mark Thomas 
On 17/01/2011 14:02, Jim Jagielski wrote:
 I'd like to look over the remaining STATUS of 5.5 in hopes of
 getting a 5.5.32 out soon... I'll RM.
 
 Comments?

+1

Mark

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

DO NOT REPLY [Bug 50604] New: Incorrect dependency in jasper.pom for eclipse ecj

2011-01-17 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=50604

   Summary: Incorrect dependency in jasper.pom for eclipse ecj
   Product: Tomcat 6
   Version: 6.0.30
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
AssignedTo: dev@tomcat.apache.org
ReportedBy: mguille...@yahoo.fr


The version of the dependency to ecj is wrong:
dependency
  groupIdorg.eclipse.jdt.core.compiler/groupId
  artifactIdecj/artifactId
  version3.3.1/version
/dependency

There is no version 3.3.1. This should probably be 3.5.1:
http://repo2.maven.org/maven2/org/eclipse/jdt/core/compiler/ecj/

This bug has been introduced on 22/09/10 *after* release 6.0.29. In fact I'm
quite surprised that deployment to the Maven central repository is allowed with
such a bad reference as the rules are now stronger (what is good))

Tomcat 7 seems to contain wrong references as well (reference to ecj 3.6 which
doesn't exist either as far as I can see). This is particularly bad here as the
improved embeddable possibilities should be one feature of Tomcat 7.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

svn commit: r1059993 - in /tomcat/trunk: java/org/apache/catalina/core/ApplicationFilterConfig.java webapps/docs/changelog.xml

2011-01-17 Thread markt 
Author: markt
Date: Mon Jan 17 17:12:36 2011
New Revision: 1059993

URL: http://svn.apache.org/viewvc?rev=1059993view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50597
Don't instantiate a new instance of a Filter if an instance was provided via 
the ServletContext.addFilter(String, Filter) method.
Patch provided by Ismael Juma.

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1059993r1=1059992r2=1059993view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Mon 
Jan 17 17:12:36 2011
@@ -367,10 +367,10 @@ public final class ApplicationFilterConf
 this.filter = null;
 
 } else {
-
-// Allocate a new filter instance
-getFilter();
-
+// Allocate a new filter instance if necessary
+if (filterDef.getFilter() == null) {
+getFilter();
+}
 }
 
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1059993r1=1059992r2=1059993view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jan 17 17:12:36 2011
@@ -69,6 +69,12 @@
 bug50582/bug: Refactor access logging so chunked encoding is not
 forced for all requests if bytes sent is logged. (markt)
   /fix
+  fix
+bug50597/bug: Donapos;t instantiate a new instance of a Filter if
+an instance was provided via the
+codeServletContext.addFilter(String, Filter)/code method. Patch
+provided by Ismael Juma. (markt)
+  /fix
 /changelog
   /subsection
   subsection name=Jasper



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

DO NOT REPLY [Bug 50597] Class.newInstance is used for Dynamic instance filters causing InstantiationException

2011-01-17 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=50597

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Mark Thomas ma...@apache.org 2011-01-17 12:13:09 EST ---
Thanks for the patch. It has been applied to 7.0.x and will be included in
7.0.7 onwards.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

svn commit: r1060002 - in /tomcat/trunk: java/org/apache/catalina/ant/AbstractCatalinaTask.java java/org/apache/catalina/ant/package.html res/deployer/build.xml webapps/docs/appdev/build.xml.txt webap

2011-01-17 Thread markt 
Author: markt
Date: Mon Jan 17 17:19:37 2011
New Revision: 1060002

URL: http://svn.apache.org/viewvc?rev=1060002view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50598
Correct URL for manager text interface

Modified:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
tomcat/trunk/java/org/apache/catalina/ant/package.html
tomcat/trunk/res/deployer/build.xml
tomcat/trunk/webapps/docs/appdev/build.xml.txt
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/deployer-howto.xml

Modified: tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=1060002r1=1060001r2=1060002view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java Mon Jan 
17 17:19:37 2011
@@ -88,7 +88,7 @@ public abstract class AbstractCatalinaTa
 /**
  * The URL of the codeManager/code application to be used.
  */
-protected String url = http://localhost:8080/manager;;
+protected String url = http://localhost:8080/manager/text;;
 
 public String getUrl() {
 return (this.url);

Modified: tomcat/trunk/java/org/apache/catalina/ant/package.html
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/package.html?rev=1060002r1=1060001r2=1060002view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/package.html (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/package.html Mon Jan 17 17:19:37 
2011
@@ -38,8 +38,8 @@ sent directly to the Manager application
 td
   The URL of the Manager web application you will use to
   perform the requested operations.  If not specified, defaults to
-  codehttp://localhost:8080/manager/code (which corresponds
-  to a standard installation of Tomcat 5).
+  codehttp://localhost:8080/manager/text/code (which corresponds
+  to a standard installation of Tomcat 7).
 /td
   /tr
   tr

Modified: tomcat/trunk/res/deployer/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/deployer/build.xml?rev=1060002r1=1060001r2=1060002view=diff
==
--- tomcat/trunk/res/deployer/build.xml (original)
+++ tomcat/trunk/res/deployer/build.xml Mon Jan 17 17:19:37 2011
@@ -27,7 +27,7 @@
   property name=path value=/myapp/
 
   !-- Configure properties to access the Manager application --
-  property name=url  value=http://localhost:8080/manager/
+  property name=url  value=http://localhost:8080/manager/text/
   property name=username value=tomcat/
   property name=password value=tomcat/
 

Modified: tomcat/trunk/webapps/docs/appdev/build.xml.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/build.xml.txt?rev=1060002r1=1060001r2=1060002view=diff
==
--- tomcat/trunk/webapps/docs/appdev/build.xml.txt (original)
+++ tomcat/trunk/webapps/docs/appdev/build.xml.txt Mon Jan 17 17:19:37 2011
@@ -133,7 +133,7 @@
   property name=catalina.home value=../../../../ !-- UPDATE THIS! --
   property name=dist.home value=${basedir}/dist/
   property name=docs.home value=${basedir}/docs/
-  property name=manager.url   value=http://localhost:8080/manager/
+  property name=manager.url   value=http://localhost:8080/manager/text/
   property name=src.home  value=${basedir}/src/
   property name=web.home  value=${basedir}/web/
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1060002r1=1060001r2=1060002view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jan 17 17:19:37 2011
@@ -75,6 +75,9 @@
 codeServletContext.addFilter(String, Filter)/code method. Patch
 provided by Ismael Juma. (markt)
   /fix
+  fix
+bug50598/bug: Correct URL for Manager text interface. (markt)
+  /fix
 /changelog
   /subsection
   subsection name=Jasper

Modified: tomcat/trunk/webapps/docs/deployer-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/deployer-howto.xml?rev=1060002r1=1060001r2=1060002view=diff
==
--- tomcat/trunk/webapps/docs/deployer-howto.xml (original)
+++ tomcat/trunk/webapps/docs/deployer-howto.xml Mon Jan 17 17:19:37 2011
@@ -320,7 +320,7 @@
 running Tomcat server, which will be used to deploy and 
undeploy the
 web application. By default, the

DO NOT REPLY [Bug 50598] Sample build.xml uses wrong manager.url

2011-01-17 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=50598

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED
 OS/Version||All

--- Comment #1 from Mark Thomas ma...@apache.org 2011-01-17 12:21:16 EST ---
Thanks for the report. Fixed in 7.0.x and will be included in 7.0.7 onwards.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

DO NOT REPLY [Bug 50599] Documentation gives impression that manager role enables using ant deploy

2011-01-17 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=50599

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED
 OS/Version||All

--- Comment #1 from Mark Thomas ma...@apache.org 2011-01-17 12:31:11 EST ---
Thanks for the report. This has been fixed in 7.0.x and will be included in
7.0.7 onwards.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

svn commit: r1060015 - in /tomcat/trunk: java/org/apache/catalina/ant/package.html webapps/docs/appdev/build.xml.txt webapps/docs/appdev/processes.xml webapps/docs/changelog.xml webapps/docs/funcspecs

2011-01-17 Thread markt 
Author: markt
Date: Mon Jan 17 17:31:45 2011
New Revision: 1060015

URL: http://svn.apache.org/viewvc?rev=1060015view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50599
Use correct names of security roles for Manager app

Modified:
tomcat/trunk/java/org/apache/catalina/ant/package.html
tomcat/trunk/webapps/docs/appdev/build.xml.txt
tomcat/trunk/webapps/docs/appdev/processes.xml
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/funcspecs/fs-admin-apps.xml
tomcat/trunk/webapps/docs/realm-howto.xml

Modified: tomcat/trunk/java/org/apache/catalina/ant/package.html
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/package.html?rev=1060015r1=1060014r2=1060015view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/package.html (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/package.html Mon Jan 17 17:31:45 
2011
@@ -46,7 +46,7 @@ sent directly to the Manager application
 td align=centerusername/td
 td
   The username of a Tomcat user that has been configured with the
-  codemanager/code role, as required to execute Manager
+  codemanager-script/code role, as required to execute Manager
   application commands.  This attribute is required.
 /td
   /tr
@@ -54,7 +54,7 @@ sent directly to the Manager application
 td align=centerpassword/td
 td
   The password of a Tomcat user that has been configured with the
-  codemanager/code role, as required to execute Manager
+  codemanager-script/code role, as required to execute Manager
   application commands.  This attribute is required.
 /td
   /tr

Modified: tomcat/trunk/webapps/docs/appdev/build.xml.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/build.xml.txt?rev=1060015r1=1060014r2=1060015view=diff
==
--- tomcat/trunk/webapps/docs/appdev/build.xml.txt (original)
+++ tomcat/trunk/webapps/docs/appdev/build.xml.txt Mon Jan 17 17:31:45 2011
@@ -113,7 +113,7 @@
Defaults to dist.
 
   manager.password The login password of a user that is assigned the
-   manager role (so that he or she can execute
+   manager-script role (so that he or she can execute
commands via the /manager web application)
 
   manager.url  The URL of the /manager web application on the
@@ -121,7 +121,7 @@
applications and web services.
 
   manager.username The login username of a user that is assigned the
-   manager role (so that he or she can execute
+   manager-script role (so that he or she can execute
commands via the /manager web application)
 
 --

Modified: tomcat/trunk/webapps/docs/appdev/processes.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/processes.xml?rev=1060015r1=1060014r2=1060015view=diff
==
--- tomcat/trunk/webapps/docs/appdev/processes.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/processes.xml Mon Jan 17 17:31:45 2011
@@ -63,12 +63,12 @@ once (no matter how many web application
 br/br//li
 liemDefine one or more Tomcat users/em.  The emManager/em web
 application runs under a security constraint that requires a user to be
-logged in, and have the security role codemanager/code assigned to
-him or her.  How such users are defined depends on which Realm you have
+logged in, and have the security role codemanager-script/code assigned
+to him or her.  How such users are defined depends on which Realm you have
 configured in Tomcat's codeconf/server.xml/code file -- see the
 a href=../realm-howto.htmlRealm Configuration HOW-TO/a for more
 information.  You may define any number of users (with any username
-and password that you like) with the codemanager/code role.
+and password that you like) with the codemanager-script/code role.
 br/br//li
 /ul
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1060015r1=1060014r2=1060015view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jan 17 17:31:45 2011
@@ -121,6 +121,10 @@
 Correct the documentation for the recoveryCount count attribute of the
 the default cluster membership. (markt)
   /fix
+  fix
+bug50599/bug: Use correct names of roles required to access the 
+Manager application. (markt)
+  /fix
 /changelog
   /subsection
   subsection name=Other

Modified:

Re: Time for 5.5.32??

2011-01-17 Thread Konstantin Kolinko 
2011/1/17 Mark Thomas ma...@apache.org:
 On 17/01/2011 14:02, Jim Jagielski wrote:
 I'd like to look over the remaining STATUS of 5.5 in hopes of
 getting a 5.5.32 out soon... I'll RM.

 Comments?

 +1


+1

Best regards,
Konstantin Kolinko

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

DO NOT REPLY [Bug 50604] Incorrect dependency in jasper.pom for eclipse ecj

2011-01-17 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=50604

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #1 from Mark Thomas ma...@apache.org 2011-01-17 12:53:15 EST ---
Those ECJ version numbers are correct. You can confirm the version being used
by looking in build.properties.default in the root of the svn tag for any given
version.

The issue is that not all of the Eclipse versions make it into the Maven repos
and the organisation of the repos changes from time to time. I went and did
some digging to see which versions I could turn up and I found the same ones
you did.

I thought I had found other versions in the past but my recollection may be
wrong. You'll need to load the JARs manually into your local repo.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

DO NOT REPLY [Bug 50597] Class.newInstance is used for Dynamic instance filters causing InstantiationException

2011-01-17 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=50597

--- Comment #3 from Ismael Juma mli...@juma.me.uk 2011-01-17 15:06:04 EST ---
Thanks!

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

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

2011-01-17 Thread kfujino 
Author: kfujino
Date: Tue Jan 18 05:56:50 2011
New Revision: 1060198

URL: http://svn.apache.org/viewvc?rev=1060198view=rev
Log:
my votes

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=1060198r1=1060197r2=1060198view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan 18 05:56:50 2011
@@ -143,7 +143,7 @@ PATCHES PROPOSED TO BACKPORT:
   Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413#c6
   Serve the error page regardless of Range header in the original request.
   http://svn.apache.org/viewvc?rev=1056889view=rev
-  +1: kkolinko, markt
+  +1: kkolinko, markt, kfujino
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50205
@@ -155,13 +155,13 @@ PATCHES PROPOSED TO BACKPORT:
 
   Updated patch (merge of revs.1057275,1057788,1057990):
   http://people.apache.org/~kkolinko/patches/2011-01-17_tc6_50205.patch
-  +1: kkolinko
+  +1: kkolinko, kfujino
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50600
   Avoid ConcurrentModificationException when removing WAR via FarmWarDeployer
   http://svn.apache.org/viewvc?rev=1059881view=rev
-  +1: markt, kkolinko
+  +1: markt, kkolinko, kfujino
   -1:
 
   
\ No newline at end of file



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

DO NOT REPLY [Bug 50604] Incorrect dependency in jasper.pom for eclipse ecj

2011-01-17 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=50604

--- Comment #2 from Marc Guillemot mguille...@yahoo.fr 2011-01-18 02:25:48 
EST ---
No matter whether these versions exist somewhere or not, if you publish to the
maven central repository, then it means that you want to allow your users to
use Tomcat from there. If you depend on versions that are not available there,
you just put your users into trouble (in fact from the logic, the central repo
should forbid such an artifact).

From http://maven.apache.org/guides/mini/guide-central-repository-upload.html
...we do strongly encourage making sure all your dependencies are included in
Central. If you rely on sketchy repositories that have junk in them or
disappear, it just creates havok for downstream users.

Is there one (or a set of) Maven repository(ies) that can *safely* be used for
Tomcat dependencies? The central repo was ok for 6.0.29 but it is not the case
anymore for 6.0.30.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

DO NOT REPLY [Bug 50606] New: Error running CGI executable in Tomcat 6.0.30

2011-01-17 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=50606

   Summary: Error running CGI executable in Tomcat 6.0.30
   Product: Tomcat 6
   Version: 6.0.30
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: bas...@obninsk.com


Created an attachment (id=26502)
 -- (https://issues.apache.org/bugzilla/attachment.cgi?id=26502)
localhost.2011-01-18.log

I have web application hosting CGI executable with the following settings for
CGI
servlet
servlet-namecgi/servlet-name
servlet-classorg.apache.catalina.servlets.CGIServlet/servlet-class
init-param
  param-namedebug/param-name
  param-value2/param-value
/init-param
init-param
  param-namecgiPathPrefix/param-name
  param-valueWEB-INF/cgi/param-value
/init-param
init-param
  param-nameexecutable/param-name
  param-value/param-value
/init-param
init-param
  param-namepassShellEnvironment/param-name
  param-valuetrue/param-value
/init-param   
/servlet

This was Ok in Tomcat 6.0.29 but not in 6.0.30, see attachment.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

svn commit: r1060226 - in /tomcat: tc6.0.x/trunk/java/org/apache/catalina/ant/package.html tc6.0.x/trunk/webapps/docs/config/listeners.xml trunk/webapps/docs/config/listeners.xml

2011-01-17 Thread kkolinko 
Author: kkolinko
Date: Tue Jan 18 07:46:18 2011
New Revision: 1060226

URL: http://svn.apache.org/viewvc?rev=1060226view=rev
Log:
Correct a pair of typos in documentation

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/package.html
tomcat/tc6.0.x/trunk/webapps/docs/config/listeners.xml
tomcat/trunk/webapps/docs/config/listeners.xml

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/package.html
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/package.html?rev=1060226r1=1060225r2=1060226view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/package.html (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/package.html Tue Jan 18 
07:46:18 2011
@@ -39,7 +39,7 @@ sent directly to the Manager application
   The URL of the Manager web application you will use to
   perform the requested operations.  If not specified, defaults to
   codehttp://localhost:8080/manager/code (which corresponds
-  to a standard installation of Tomcat 5).
+  to a standard installation of Tomcat 6).
 /td
   /tr
   tr

Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/listeners.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/listeners.xml?rev=1060226r1=1060225r2=1060226view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/listeners.xml Tue Jan 18 07:46:18 
2011
@@ -121,7 +121,7 @@
 (org.apache.catalina.mbeans.ServerLifecycleListener)/h3
 
 pThe strongServer Lifecycle Listener/strong initializes the
-MBeanServer for the MBeans that may be used to manager Tomcat via JMX.
+MBeanServer for the MBeans that may be used to manage Tomcat via JMX.
 Without this listener, none of the Tomcat MBeans will be available./p
 
 pThis listener must only be nested within a 
href=server.htmlServer/a

Modified: tomcat/trunk/webapps/docs/config/listeners.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/listeners.xml?rev=1060226r1=1060225r2=1060226view=diff
==
--- tomcat/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/trunk/webapps/docs/config/listeners.xml Tue Jan 18 07:46:18 2011
@@ -121,7 +121,7 @@
 (org.apache.catalina.mbeans.ServerLifecycleListener)/h3
 
 pThe strongServer Lifecycle Listener/strong initializes the
-MBeanServer for the MBeans that may be used to manager Tomcat via JMX.
+MBeanServer for the MBeans that may be used to manage Tomcat via JMX.
 Without this listener, none of the Tomcat MBeans will be available./p
 
 pThis listener must only be nested within a 
href=server.htmlServer/a



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