Re: WebAppClassLoader#addrepository and #addURL

2013-04-25 Thread Romain Manni-Bucau
Thanks, playing with org.apache.catalina.WebResourceRoot can work.

That said not respecting addURL maybe means you should override it to throw
an UnsupportedOperataion no? + the comment
of org.apache.catalina.loader.WebappClassLoader#getURLs is weird since it
references addURL


*Romain Manni-Bucau*
*Twitter: @rmannibucau https://twitter.com/rmannibucau*
*Blog: **http://rmannibucau.wordpress.com/*http://rmannibucau.wordpress.com/
*LinkedIn: **http://fr.linkedin.com/in/rmannibucau*
*Github: https://github.com/rmannibucau*



2013/4/24 Konstantin Kolinko knst.koli...@gmail.com

 2013/4/24 Mark Thomas ma...@apache.org:
  On 24/04/2013 17:51, Romain Manni-Bucau wrote:
 
  how libs/extension (like tomee) should extend it?
 
 
  Use the replacement feature.
 

 resources

 In nightly Tomcat 8 docs those are described here:
 http://ci.apache.org/projects/tomcat/tomcat8/docs/config/resources.html


  (...)

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




[Tomcat Wiki] Trivial Update of Micki63O by Micki63O

2013-04-25 Thread Apache Wiki
Dear Wiki user,

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

The Micki63O page has been changed by Micki63O:
http://wiki.apache.org/tomcat/Micki63O

New page:
The writer is regarded by the name of Dudley Deshazo but folks always misspell 
it.BR
His wife and him stay in Guam. He is an business office supervisor and he'll be 
promoted soon. The most loved pastime for him and his little ones is kayaking 
and now he has time to consider on new items. He's not godd at style and design 
but you may well want to examine his internet site: http://www.BR
weeklyvolcano.com/community/people/ChristoperB/posts/SlimBerry-Cleanse-Diet/

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



[Bug 54890] New: Change commons-daemon dependency from 1.0.14 to 1.0.15

2013-04-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=54890

Bug ID: 54890
   Summary: Change commons-daemon dependency from 1.0.14 to 1.0.15
   Product: Tomcat 7
   Version: trunk
  Hardware: All
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Integration
  Assignee: dev@tomcat.apache.org
  Reporter: ognjen.d.blagoje...@gmail.com
Classification: Unclassified

Several users, myself included, reported problems when running jsvc from Tomcat
7.0.39, due to DAEMON-291.

If there is no other obstacles, please change commons-daemon dependency from
1.0.14 to 1.0.15.

-Ognjen

-- 
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



[Tomcat Wiki] Trivial Update of Necessary_Details_For_home_sweet_home by LucioOlve

2013-04-25 Thread Apache Wiki
Dear Wiki user,

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

The Necessary_Details_For_home_sweet_home page has been changed by LucioOlve:
http://wiki.apache.org/tomcat/Necessary_Details_For_home_sweet_home

New page:
Instead of asking for his help, again she softly says excuse me and continues 
her work while another molehill grows into a mighty mountain. The 23-year-old 
singer carried her giant red bag on the beach as well. Plaque placed by the 
State Department of Parks and Recreation in cooperation with San Bernardino 
County Regional Parks Department May 12,1973. Now, they have their own 
superhero in Blake Griffin, but at this time last season they were just hoping 
that he would become a productive big man. He had sung Never Can Say Goodbye 
Wednesday night, but then he had to anyway. BR
BR
Believe it or not, there is a way to visit a handful of amusement parks and 
entertainment events and at the end of each day, still have enough cash 
leftover to squander it without uneasiness on cheesy souvenirs like the theme 
imprinted pressed penny or the animal of your choice miraculously crafted in 
wax by a machine in less then three minutes. These devices are plugged into 
wall outlets and emit sound waves that rodents supposedly do not like. 
Uplifting the less fortunate upon hearing an all important positive quote, 
while feeding their souls with lots of love, food, kindness, and compassions of 
gold. To qualify for services, an individual has to be elderly and disabled, 
physically or developmentally disabled, or mentally ill or mentally retarded. 
Courage: the state or quality of mind or spirit that enables one to face danger 
or fear with self-possession, confidence, and resolution. BR
BR
Before you have a coronary, it's not replacing the neighborhood. Tommy Lee put 
away the double bass for a sweet piano opening that started a special song. But 
every painting captivates the gallery lover and might leave a visitor 
wondering, Where did the good ol' days of family life go. Meanwhile, Fatally 
Unique is the second act of the evening. The Issues - While You Where Out - If 
you are the one who must travel for you work there are some things you should 
keep in mind while you are away. BR
BR
I will tell you what the best Yankee Candle Gift Sets are to give this year to 
a loved one this Christmas, and how much they cost as well as where you can 
purchase them. I set out several of these pads where mouse activity was present 
and caught only crawling bugs. 31 an ounce to 63 cents Calico and most of the 
early western towns turned into ghosts of their former selves. We cannot use 
our hands, or our legs, or our eyes, or our arms. I can't believe someone had 
the audacity to charge me money for this report. BR
BR
If any repairs are made as a result of an inspection, I will ask for the 
credentials of the person doing the work. What keeps the book engaging are 
French's touches of sarcasm and humor throughout. At the same time your spouse 
may feel left out and stuck at home. We can make your house a really 
fantastic that is why we have a huge satisfied customers and the list is 
increasing day by day. Its purpose is to target all housing discrimination in 
all parts of the country.BR
BR
Here's more information on 
[[http://www.articledirectoryusa.com/article/category/home-and-family/home-improvement/the-essence-of-having-your-own-home-sweet-home/|please
 click the up coming document]] look into 
www.articledirectoryusa.com/article/category/home-and-family/home-improvement/the-essence-of-having-your-own-home-sweet-home/

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



[Tomcat Wiki] Update of LocalBadContent by SebastianBazley

2013-04-25 Thread Apache Wiki
Dear Wiki user,

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

The LocalBadContent page has been changed by SebastianBazley:
http://wiki.apache.org/tomcat/LocalBadContent?action=diffrev1=148rev2=149

Comment:
Recent spammers (hopefully the last!)

  angosso\.com
  angosso\.net
  aprendedanzaoriental\.info
+ articledirectoryusa\.com
  ask\.com
  athertongrace\.com
  autismoutofthebox\.com
@@ -253, +254 @@

  webdesigner-essen\.de
  webs\.com
  webstarts\.com
+ weeklyvolcano\.com/community/people/ChristoperB
  weho\.org
  weloveourlake\.com
  whatisms

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



Time for 6.0.37?

2013-04-25 Thread jean-frederic clere

Hi,

I think it is time for a 6.0.37, comments?

Cheers

Jean-Frederic

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



Re: [RESULT][VOTE] Tighten up wiki security to reduce spam

2013-04-25 Thread Tim Funk
My wiki id is TimFunk

-Tim


On Wed, Apr 24, 2013 at 4:38 PM, Konstantin Kolinko
knst.koli...@gmail.comwrote:

 2013/4/25 Mark Thomas ma...@apache.org:
  On 24/04/2013 21:23, Mark Thomas wrote:
  +1 (binding): markt, funkman, rjung, olamy, kkolinko (with regret)
  +1:   Ognjen Blagojevic, violetagg, Chuck
 
  I'll ask infra to make the necessary changes.
 
  Done:
 
  https://issues.apache.org/jira/browse/INFRA-6196
 
  Based on the most recent anti-spam efforts I requested the Konstantin,
  Chuck and I be added to the admin group. We can add other community
  members on request (same for contributors). The first task will be to
  add the current committers and any other regular contributors to the
  contributors group.
 





[Tomcat Wiki] Update of FrontPage by SebastianBazley

2013-04-25 Thread Apache Wiki
Dear Wiki user,

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

The FrontPage page has been changed by SebastianBazley:
http://wiki.apache.org/tomcat/FrontPage?action=diffrev1=30rev2=31

Comment:
Add note re ContributorsGroup

  {{http://tomcat.apache.org/images/tomcat.gif}}
  
  This is the Wiki for Apache Tomcat, a Servlet and Java Server Pages container 
developed under the Apache License. The main documentation for this product is 
at [[http://tomcat.apache.org|tomcat.apache.org]]. Below is a list of some 
useful pages: we encourage everyone to contribute to these pages or start new 
ones as desired. But before you do, please check out the main documentation 
site as well as the [[FAQ]] and the 
[[http://tomcat.apache.org/lists.html|mailing lists]] (whose archives are 
searchable).
+ 
+ If you do decide to contribute, you will need to create a Wiki login name and 
then send an e-mail to the Tomcat developer list 
[[http://tomcat.apache.org/lists.html|mailing lists]] asking to be added to the 
ContributorsGroup. Please remember to provide your Wiki name. Apologies for 
this extra step, but it's necessary to combat spam.
  
   * '''[[GettingStarted|Getting Started]]''' - Getting started with Tomcat.
   * '''[[TomcatVersions|Tomcat versions]]''' - A list of every Tomcat version 
and its current status.

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



[Tomcat Wiki] Update of FrontPage by KonstantinKolinko

2013-04-25 Thread Apache Wiki
Dear Wiki user,

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

The FrontPage page has been changed by KonstantinKolinko:
http://wiki.apache.org/tomcat/FrontPage?action=diffrev1=31rev2=32

Comment:
I think the users list is OK as well

  
  This is the Wiki for Apache Tomcat, a Servlet and Java Server Pages container 
developed under the Apache License. The main documentation for this product is 
at [[http://tomcat.apache.org|tomcat.apache.org]]. Below is a list of some 
useful pages: we encourage everyone to contribute to these pages or start new 
ones as desired. But before you do, please check out the main documentation 
site as well as the [[FAQ]] and the 
[[http://tomcat.apache.org/lists.html|mailing lists]] (whose archives are 
searchable).
  
- If you do decide to contribute, you will need to create a Wiki login name and 
then send an e-mail to the Tomcat developer list 
[[http://tomcat.apache.org/lists.html|mailing lists]] asking to be added to the 
ContributorsGroup. Please remember to provide your Wiki name. Apologies for 
this extra step, but it's necessary to combat spam.
+ If you do decide to contribute, you will need to create a Wiki login name and 
then send an e-mail to the Tomcat developer list or [[FAQ/Tomcat_User|Tomcat 
user list]], see [[http://tomcat.apache.org/lists.html|mailing lists]] page for 
details, asking to be added to the ContributorsGroup. Please remember to 
provide your Wiki name. Apologies for this extra step, but it's necessary to 
combat spam.
  
   * '''[[GettingStarted|Getting Started]]''' - Getting started with Tomcat.
   * '''[[TomcatVersions|Tomcat versions]]''' - A list of every Tomcat version 
and its current status.

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



[Tomcat Wiki] Update of AdminGroup by KonstantinKolinko

2013-04-25 Thread Apache Wiki
Dear Wiki user,

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

The AdminGroup page has been changed by KonstantinKolinko:
http://wiki.apache.org/tomcat/AdminGroup?action=diffrev1=6rev2=7

Comment:
Add Tim

   * KonstantinKolinko
   * markt
   * SebastianBazley
+  * TimFunk
  

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



[Tomcat Wiki] Update of ContributorsGroup by KonstantinKolinko

2013-04-25 Thread Apache Wiki
Dear Wiki user,

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

The ContributorsGroup page has been changed by KonstantinKolinko:
http://wiki.apache.org/tomcat/ContributorsGroup?action=diffrev1=3rev2=4

Comment:
Correct wiki name. I think Tomcat user list is OK as well.

  #acl AdminGroup:read,write,admin,revert,delete All:read
- '''Contributors''' with permission to edit the Commons wiki – read, write, 
delete and revert pages or individual changes. 
+ '''Contributors''' with permission to edit the Tomcat wiki – read, write, 
delete and revert pages or individual changes. 
- To be added to this group, please send a brief request to the 
[[http://commons.apache.org/mail-lists.html| Commons dev@ list]] including your 
Wiki username.
+ To be added to this group, please send a brief request with your Wiki 
username to the Tomcat developer list or Tomcat user list, see 
[[http://tomcat.apache.org/lists.html|mailing lists]] page.
  
   * AdminGroup
   * [Krzysztof Gil]

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



[Tomcat Wiki] Update of AdminGroup by KonstantinKolinko

2013-04-25 Thread Apache Wiki
Dear Wiki user,

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

The AdminGroup page has been changed by KonstantinKolinko:
http://wiki.apache.org/tomcat/AdminGroup?action=diffrev1=7rev2=8

Comment:
Add Pid

   * IanDarwin
   * KonstantinKolinko
   * markt
+  * PidSter
   * SebastianBazley
   * TimFunk
  

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



[Tomcat Wiki] Update of ContributorsGroup by KonstantinKolinko

2013-04-25 Thread Apache Wiki
Dear Wiki user,

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

The ContributorsGroup page has been changed by KonstantinKolinko:
http://wiki.apache.org/tomcat/ContributorsGroup?action=diffrev1=4rev2=5

Comment:
Reorder. The list is from the last 90 days of change log.

  To be added to this group, please send a brief request with your Wiki 
username to the Tomcat developer list or Tomcat user list, see 
[[http://tomcat.apache.org/lists.html|mailing lists]] page.
  
   * AdminGroup
+  * AndreaBrugiolo
+  * dblevins
+  * developintelligence
+  * GlenIhrig
   * [Krzysztof Gil]
   * NevenCvetkovic
-  * AndreaBrugiolo
   * ShawnYu
-  * GlenIhrig
  

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



[Tomcat Wiki] Update of LocalBadContent by ChuckCaldarale

2013-04-25 Thread Apache Wiki
Dear Wiki user,

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

The LocalBadContent page has been changed by ChuckCaldarale:
http://wiki.apache.org/tomcat/LocalBadContent?action=diffrev1=149rev2=150

  webdesigner-essen\.de
  webs\.com
  webstarts\.com
- weeklyvolcano\.com/community/people/ChristoperB
+ weeklyvolcano\.com
  weho\.org
  weloveourlake\.com
  whatisms

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



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

2013-04-25 Thread mturk
Author: mturk
Date: Thu Apr 25 12:46:40 2013
New Revision: 1475731

URL: http://svn.apache.org/r1475731
Log:
Fix BZ54890. Update daemon to latest release

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=1475731r1=1475730r2=1475731view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Thu Apr 25 12:46:40 2013
@@ -146,7 +146,7 @@ nsis.nsisdl.dll=${nsis.home}/Plugins/NSI
 nsis.loc=${base-sf.loc}/nsis/nsis-2.46.zip
 
 # - Commons Daemon, version 1.0-Alpha or later -
-commons-daemon.version=1.0.10
+commons-daemon.version=1.0.15
 commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
 
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
 commons-daemon.native.win.home=${commons-daemon.home}/windows



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



svn commit: r1475733 - /tomcat/tc7.0.x/trunk/build.properties.default

2013-04-25 Thread mturk
Author: mturk
Date: Thu Apr 25 12:47:01 2013
New Revision: 1475733

URL: http://svn.apache.org/r1475733
Log:
Fix BZ54890. Update daemon to latest release

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

Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1475733r1=1475732r2=1475733view=diff
==
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Thu Apr 25 12:47:01 2013
@@ -161,7 +161,7 @@ nsis.nsisdl.dll=${nsis.home}/Plugins/NSI
 nsis.loc=${base-sf.loc}/nsis/nsis-2.46.zip
 
 # - Commons Daemon, version 1.0-Alpha or later -
-commons-daemon.version=1.0.14
+commons-daemon.version=1.0.15
 commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
 
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
 commons-daemon.native.win.home=${commons-daemon.home}/windows



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



[Bug 54890] Change commons-daemon dependency from 1.0.14 to 1.0.15

2013-04-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=54890

Mladen Turk mt...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Mladen Turk mt...@apache.org ---
Fixed in SVN. Will be part of next release

-- 
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



Re: Time for 6.0.37?

2013-04-25 Thread Mark Thomas
On 25/04/2013 10:33, jean-frederic clere wrote:
 Hi,
 
 I think it is time for a 6.0.37, comments?

Sure. Haven't looked at the status file for a while so I probably have
some voting to do.

Mark


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



svn commit: r1475736 - /tomcat/trunk/build.properties.default

2013-04-25 Thread mturk
Author: mturk
Date: Thu Apr 25 12:50:42 2013
New Revision: 1475736

URL: http://svn.apache.org/r1475736
Log:
Fix BZ54890. Update daemon to latest release

Modified:
tomcat/trunk/build.properties.default

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1475736r1=1475735r2=1475736view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Apr 25 12:50:42 2013
@@ -167,7 +167,7 @@ nsis.nsisdl.dll=${nsis.home}/Plugins/NSI
 nsis.loc=${base-sf.loc}/nsis/nsis-2.46.zip
 
 # - Commons Daemon, version 1.0-Alpha or later -
-commons-daemon.version=1.0.14
+commons-daemon.version=1.0.15
 commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
 
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
 commons-daemon.native.win.home=${commons-daemon.home}/windows



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



Re: [Tomcat Wiki] Update of LocalBadContent by ChuckCaldarale

2013-04-25 Thread sebb
Is all of that URL spammy?

I specifically included most of the path because I thought there might be
valid content elsewhere on the site.


On 25 April 2013 13:46, Apache Wiki wikidi...@apache.org wrote:

 Dear Wiki user,

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

 The LocalBadContent page has been changed by ChuckCaldarale:
 http://wiki.apache.org/tomcat/LocalBadContent?action=diffrev1=149rev2=150

   webdesigner-essen\.de
   webs\.com
   webstarts\.com
 - weeklyvolcano\.com/community/people/ChristoperB
 + weeklyvolcano\.com
   weho\.org
   weloveourlake\.com
   whatisms

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




[Bug 54890] Change commons-daemon dependency from 1.0.14 to 1.0.15

2013-04-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=54890

Ognjen Blagojevic ognjen.d.blagoje...@gmail.com changed:

   What|Removed |Added

 Status|RESOLVED|CLOSED

--- Comment #2 from Ognjen Blagojevic ognjen.d.blagoje...@gmail.com ---
Thank you.

-- 
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



RE: [Tomcat Wiki] Update of LocalBadContent by ChuckCaldarale

2013-04-25 Thread Caldarale, Charles R
 From: sebb [mailto:seb...@gmail.com] 
 Subject: Re: [Tomcat Wiki] Update of LocalBadContent by ChuckCaldarale

 Is all of that URL spammy?

 I specifically included most of the path because I thought there might be
 valid content elsewhere on the site.

Not likely, unless you're looking for entertainment information around Seattle.

 - Chuck


THIS COMMUNICATION MAY CONTAIN CONFIDENTIAL AND/OR OTHERWISE PROPRIETARY 
MATERIAL and is thus for use only by the intended recipient. If you received 
this in error, please contact the sender and delete the e-mail and its 
attachments from all computers.


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



svn commit: r1475750 - in /tomcat/trunk: java/org/apache/jasper/compiler/ test/org/apache/jasper/compiler/ test/webapp-3.0/bug5nnnn/

2013-04-25 Thread markt
Author: markt
Date: Thu Apr 25 13:16:45 2013
New Revision: 1475750

URL: http://svn.apache.org/r1475750
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54801
and
https://issues.apache.org/bugzilla/show_bug.cgi?id=54821
Don'try to parse EL expressions if EL is disabled or inside scriptlets.
Based on patches by kkolinko

Added:
tomcat/trunk/test/webapp-3.0/bug5/bug54801a.jspx
tomcat/trunk/test/webapp-3.0/bug5/bug54801b.jspx
tomcat/trunk/test/webapp-3.0/bug5/bug54821a.jspx
tomcat/trunk/test/webapp-3.0/bug5/bug54821b.jspx
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java?rev=1475750r1=1475749r2=1475750view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java Thu Apr 
25 13:16:45 2013
@@ -484,7 +484,8 @@ class JspDocumentParser
 tagDependentNesting++;
 }
 
-if (tagDependentNesting  0) {
+if (tagDependentNesting  0 || pageInfo.isELIgnored() ||
+current instanceof Node.ScriptingElement) {
 if (charBuffer.length()  0) {
 @SuppressWarnings(unused)
 Node unused = new Node.TemplateText(

Modified: 
tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java?rev=1475750r1=1475749r2=1475750view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java 
(original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java Thu 
Apr 25 13:16:45 2013
@@ -22,9 +22,7 @@ import java.io.IOException;
 
 import javax.servlet.http.HttpServletResponse;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 import org.apache.catalina.startup.Tomcat;
@@ -47,7 +45,7 @@ public class TestJspDocumentParser exten
 int rc = getUrl(http://localhost:; + getPort() +
 /test/bug47977.jspx, new ByteChunk(), null);
 
-assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
+Assert.assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
 }
 
 @Test
@@ -69,6 +67,48 @@ public class TestJspDocumentParser exten
 }
 
 // Should not fail
-assertNull(e);
+Assert.assertNull(e);
+}
+
+@Test
+public void testBug54801() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File(test/webapp-3.0);
+// app dir is relative to server home
+tomcat.addWebapp(null, /test, appDir.getAbsolutePath());
+
+tomcat.start();
+
+ByteChunk bc = new ByteChunk();
+int rc = getUrl(http://localhost:; + getPort() +
+/test/bug5/bug54801a.jspx, bc, null);
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+
+bc.recycle();
+rc = getUrl(http://localhost:; + getPort() +
+/test/bug5/bug54801b.jspx, bc, null);
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
 }
+
+@Test
+public void testBug54821() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File(test/webapp-3.0);
+// app dir is relative to server home
+tomcat.addWebapp(null, /test, appDir.getAbsolutePath());
+
+tomcat.start();
+
+ByteChunk bc = new ByteChunk();
+int rc = getUrl(http://localhost:; + getPort() +
+/test/bug5/bug54821a.jspx, bc, null);
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+
+bc.recycle();
+rc = getUrl(http://localhost:; + getPort() +
+/test/bug5/bug54821b.jspx, bc, null);
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+   }
 }

Added: tomcat/trunk/test/webapp-3.0/bug5/bug54801a.jspx
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/bug5/bug54801a.jspx?rev=1475750view=auto
==
--- tomcat/trunk/test/webapp-3.0/bug5/bug54801a.jspx (added)
+++ tomcat/trunk/test/webapp-3.0/bug5/bug54801a.jspx Thu Apr 25 13:16:45 
2013
@@ -0,0 +1,23 @@
+?xml version=1.0 encoding=utf-8 ?
+!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional 

svn commit: r1475755 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/ test/org/apache/jasper/compiler/ test/webapp-3.0/bug5nnnn/ webapps/docs/

2013-04-25 Thread markt
Author: markt
Date: Thu Apr 25 13:20:41 2013
New Revision: 1475755

URL: http://svn.apache.org/r1475755
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54801
and
https://issues.apache.org/bugzilla/show_bug.cgi?id=54821
Don't try to parse EL expressions if EL is disabled or inside scriptlets for 
JSP documents.
Based on patches by kkolinko

Added:
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug54801a.jspx
  - copied unchanged from r1475750, 
tomcat/trunk/test/webapp-3.0/bug5/bug54801a.jspx
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug54801b.jspx
  - copied unchanged from r1475750, 
tomcat/trunk/test/webapp-3.0/bug5/bug54801b.jspx
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug54821a.jspx
  - copied unchanged from r1475750, 
tomcat/trunk/test/webapp-3.0/bug5/bug54821a.jspx
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug54821b.jspx
  - copied unchanged from r1475750, 
tomcat/trunk/test/webapp-3.0/bug5/bug54821b.jspx
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java

tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1475750

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java?rev=1475755r1=1475754r2=1475755view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java 
Thu Apr 25 13:20:41 2013
@@ -488,7 +488,8 @@ class JspDocumentParser
 tagDependentNesting++;
 }
 
-if (tagDependentNesting  0) {
+if (tagDependentNesting  0 || pageInfo.isELIgnored() ||
+current instanceof Node.ScriptingElement) {
 if (charBuffer.length()  0) {
 new Node.TemplateText(charBuffer.toString(), startMark, 
current);
 }

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java?rev=1475755r1=1475754r2=1475755view=diff
==
--- 
tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java 
Thu Apr 25 13:20:41 2013
@@ -22,9 +22,7 @@ import java.io.IOException;
 
 import javax.servlet.http.HttpServletResponse;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 import org.apache.catalina.startup.Tomcat;
@@ -47,7 +45,7 @@ public class TestJspDocumentParser exten
 int rc = getUrl(http://localhost:; + getPort() +
 /test/bug47977.jspx, new ByteChunk(), null);
 
-assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
+Assert.assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
 }
 
 @Test
@@ -69,6 +67,48 @@ public class TestJspDocumentParser exten
 }
 
 // Should not fail
-assertNull(e);
+Assert.assertNull(e);
+}
+
+@Test
+public void testBug54801() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File(test/webapp-3.0);
+// app dir is relative to server home
+tomcat.addWebapp(null, /test, appDir.getAbsolutePath());
+
+tomcat.start();
+
+ByteChunk bc = new ByteChunk();
+int rc = getUrl(http://localhost:; + getPort() +
+/test/bug5/bug54801a.jspx, bc, null);
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+
+bc.recycle();
+rc = getUrl(http://localhost:; + getPort() +
+/test/bug5/bug54801b.jspx, bc, null);
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
 }
+
+@Test
+public void testBug54821() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File(test/webapp-3.0);
+// app dir is relative to server home
+tomcat.addWebapp(null, /test, appDir.getAbsolutePath());
+
+tomcat.start();
+
+ByteChunk bc = new ByteChunk();
+int rc = getUrl(http://localhost:; + getPort() +
+/test/bug5/bug54821a.jspx, bc, null);
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+
+bc.recycle();
+rc = getUrl(http://localhost:; + getPort() 

[Bug 54801] EL-like expressions in jsp:scriptlet break compilation of JSP XML documents

2013-04-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=54801

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

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #6 from Mark Thomas ma...@apache.org ---
Fixed in trunk and will be included in 7.0.40 onwards.
I turned the example JSP documents into unit tests.

-- 
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



[Bug 54821] Error trying to parse EL in JSP XML documents when isELIgnored = true

2013-04-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=54821

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

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #3 from Mark Thomas ma...@apache.org ---
Fixed in trunk and will be included in 7.0.40 onwards.
I turned the example JSP documents into unit tests.

-- 
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



[Bug 54882] HttpServletRequest.getRequestURI() returns also fragment

2013-04-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=54882

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

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

--- Comment #4 from Mark Thomas ma...@apache.org ---
I'm resolving this as INVALID since the bug is in a third party product. If
there is a case for implementing a work-around for this in Tomcat feel free to
re-open this bug and state the case.

-- 
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



[Bug 54882] HttpServletRequest.getRequestURI() returns also fragment

2013-04-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=54882

--- Comment #5 from Julian Reschke julian.resc...@gmx.de ---
One could argue that the request URI is invalid, thus Tomcat should reject the
request with a 404.

-- 
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: r1475760 - /tomcat/tc6.0.x/trunk/STATUS.txt

2013-04-25 Thread jfclere
Author: jfclere
Date: Thu Apr 25 13:36:11 2013
New Revision: 1475760

URL: http://svn.apache.org/r1475760
Log:
my vote.

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1475760r1=1475759r2=1475760view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 25 13:36:11 2013
@@ -55,7 +55,7 @@ PATCHES PROPOSED TO BACKPORT:
 
 * Chunked encoding improvements
   http://people.apache.org/~markt/patches/2012-10-19-chunked-encoding-tc6.patch
-  +1: markt, kkolinko
+  +1: markt, kkolinko, jfclere
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54044



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



[Bug 54882] HttpServletRequest.getRequestURI() returns also fragment

2013-04-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=54882

--- Comment #6 from Mark Thomas ma...@apache.org ---
You could, but if Tomcat did that it would be a lot harder for users to
work-around the issue until the UA is fixed.

By allowing the request to continue, users that see this issue can work-around
it with a filter until the UA is fixed.

-- 
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: r1475769 - /tomcat/tc6.0.x/trunk/STATUS.txt

2013-04-25 Thread jfclere
Author: jfclere
Date: Thu Apr 25 13:47:34 2013
New Revision: 1475769

URL: http://svn.apache.org/r1475769
Log:
more 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=1475769r1=1475768r2=1475769view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 25 13:47:34 2013
@@ -92,7 +92,7 @@ PATCHES PROPOSED TO BACKPORT:
   Update file extension to MIME type mapping in web.xml. Aligh with current
   trunk.
   https://issues.apache.org/bugzilla/attachment.cgi?id=29962
-  +1: markt, kkolinko
+  +1: markt, kkolinko, jfclere
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54601
@@ -110,7 +110,7 @@ PATCHES PROPOSED TO BACKPORT:
   This copy of daemon.sh differs from Tomcat trunk one in initialization of
   CLASSPATH setting, because tomcat-juli.jar has to be handled differently.
   http://people.apache.org/~kkolinko/patches/2013-03-26_tc6_daemonsh.patch
-  +1: kkolinko
+  +1: kkolinko, jfclere
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54615



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



svn commit: r1475791 - /tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java

2013-04-25 Thread markt
Author: markt
Date: Thu Apr 25 14:21:27 2013
New Revision: 1475791

URL: http://svn.apache.org/r1475791
Log:
Fix failing unit test now that a RuntimeException in an AsyncListener is caught 
and logged.

Modified:
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java

Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1475791r1=1475790r2=1475791view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Thu 
Apr 25 14:21:27 2013
@@ -460,15 +460,8 @@ public class TestAsyncContextImpl extend
 expected.append(requestDestroyed);
 } else if (completeOnTimeout.booleanValue()) {
 expected.append(onTimeout-);
-if (dispatchUrl == null) {
-expected.append(onComplete-);
-expected.append(requestDestroyed);
-} else {
-// Error - no further output
-// There is no onComplete- since the complete event would be
-// fired during post processing but since there is an error 
that
-// never happens.
-}
+expected.append(onComplete-);
+expected.append(requestDestroyed);
 } else {
 expected.append(onTimeout-);
 if (dispatchUrl != null) {
@@ -487,11 +480,6 @@ public class TestAsyncContextImpl extend
 alv.validateAccessLog(1, 500, TimeoutServlet.ASYNC_TIMEOUT,
 TimeoutServlet.ASYNC_TIMEOUT + TIMEOUT_MARGIN +
 REQUEST_TIME);
-} else if (completeOnTimeout.booleanValue()  dispatchUrl != null) {
-// This error is written into Host-level AccessLogValve only
-alvGlobal.validateAccessLog(1, 500, 0, TimeoutServlet.ASYNC_TIMEOUT
-+ TIMEOUT_MARGIN + REQUEST_TIME);
-alv.validateAccessLog(0, 500, 0, 0);
 } else {
 alvGlobal.validateAccessLog(1, 200, TimeoutServlet.ASYNC_TIMEOUT,
 TimeoutServlet.ASYNC_TIMEOUT + TIMEOUT_MARGIN +



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



svn commit: r1475792 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/core/TestAsyncContextImpl.java

2013-04-25 Thread markt
Author: markt
Date: Thu Apr 25 14:23:03 2013
New Revision: 1475792

URL: http://svn.apache.org/r1475792
Log:
Fix failing unit test now that a RuntimeException in an AsyncListener is caught 
and logged.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1475791

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1475792r1=1475791r2=1475792view=diff
==
--- 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java 
Thu Apr 25 14:23:03 2013
@@ -460,15 +460,8 @@ public class TestAsyncContextImpl extend
 expected.append(requestDestroyed);
 } else if (completeOnTimeout.booleanValue()) {
 expected.append(onTimeout-);
-if (dispatchUrl == null) {
-expected.append(onComplete-);
-expected.append(requestDestroyed);
-} else {
-// Error - no further output
-// There is no onComplete- since the complete event would be
-// fired during post processing but since there is an error 
that
-// never happens.
-}
+expected.append(onComplete-);
+expected.append(requestDestroyed);
 } else {
 expected.append(onTimeout-);
 if (dispatchUrl != null) {
@@ -487,11 +480,6 @@ public class TestAsyncContextImpl extend
 alv.validateAccessLog(1, 500, TimeoutServlet.ASYNC_TIMEOUT,
 TimeoutServlet.ASYNC_TIMEOUT + TIMEOUT_MARGIN +
 REQUEST_TIME);
-} else if (completeOnTimeout.booleanValue()  dispatchUrl != null) {
-// This error is written into Host-level AccessLogValve only
-alvGlobal.validateAccessLog(1, 500, 0, TimeoutServlet.ASYNC_TIMEOUT
-+ TIMEOUT_MARGIN + REQUEST_TIME);
-alv.validateAccessLog(0, 500, 0, 0);
 } else {
 alvGlobal.validateAccessLog(1, 200, TimeoutServlet.ASYNC_TIMEOUT,
 TimeoutServlet.ASYNC_TIMEOUT + TIMEOUT_MARGIN +



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



svn commit: r1475800 - in /tomcat/trunk/test/org/apache: catalina/authenticator/TestFormAuthenticator.java catalina/startup/TestTomcat.java tomcat/util/net/TestCustomSsl.java tomcat/util/net/TestSsl.j

2013-04-25 Thread markt
Author: markt
Date: Thu Apr 25 14:38:16 2013
New Revision: 1475800

URL: http://svn.apache.org/r1475800
Log:
Fix a handful of unit test failures triggered by WebSocket init changes.

Modified:

tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java

Modified: 
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java?rev=1475800r1=1475799r2=1475800view=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java 
(original)
+++ 
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java 
Thu Apr 25 14:38:16 2013
@@ -28,6 +28,7 @@ import org.apache.catalina.startup.Simpl
 import org.apache.catalina.startup.TestTomcat.MapRealm;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.websocket.server.WsListener;
 
 public class TestFormAuthenticator extends TomcatBaseTest {
 
@@ -109,6 +110,7 @@ public class TestFormAuthenticator exten
 File appDir = new File(getBuildDirectory(), webapps/examples);
 Context ctx = tomcat.addWebapp(null, /examples,
 appDir.getAbsolutePath());
+ctx.addApplicationListener(WsListener.class.getName());
 
 MapRealm realm = new MapRealm();
 realm.addUser(tomcat, tomcat);

Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1475800r1=1475799r2=1475800view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Thu Apr 25 
14:38:16 2013
@@ -50,6 +50,7 @@ import org.apache.catalina.deploy.Contex
 import org.apache.catalina.realm.GenericPrincipal;
 import org.apache.catalina.realm.RealmBase;
 import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.websocket.server.WsListener;
 
 public class TestTomcat extends TomcatBaseTest {
 
@@ -259,8 +260,9 @@ public class TestTomcat extends TomcatBa
 
 File appDir = new File(getBuildDirectory(), webapps/examples);
 // app dir is relative to server home
-tomcat.addWebapp(null, /examples, appDir.getAbsolutePath());
-
+org.apache.catalina.Context ctxt  = tomcat.addWebapp(
+null, /examples, appDir.getAbsolutePath());
+ctxt.addApplicationListener(WsListener.class.getName());
 tomcat.start();
 
 ByteChunk res = getUrl(http://localhost:; + getPort() +
@@ -274,7 +276,9 @@ public class TestTomcat extends TomcatBa
 
 File appDir = new File(getBuildDirectory(), webapps/examples);
 // app dir is relative to server home
-tomcat.addWebapp(null, /examples, appDir.getAbsolutePath());
+org.apache.catalina.Context ctxt  = tomcat.addWebapp(
+null, /examples, appDir.getAbsolutePath());
+ctxt.addApplicationListener(WsListener.class.getName());
 
 tomcat.start();
 
@@ -394,6 +398,7 @@ public class TestTomcat extends TomcatBa
 // app dir is relative to server home
 org.apache.catalina.Context ctx =
 tomcat.addWebapp(null, /examples, appDir.getAbsolutePath());
+ctx.addApplicationListener(WsListener.class.getName());
 
 Tomcat.addServlet(ctx, testGetResource, new GetResource());
 ctx.addServletMapping(/testGetResource, testGetResource);

Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java?rev=1475800r1=1475799r2=1475800view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java Thu Apr 25 
14:38:16 2013
@@ -27,6 +27,7 @@ import static org.junit.Assert.fail;
 
 import org.junit.Test;
 
+import org.apache.catalina.Context;
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
@@ -34,6 +35,7 @@ import org.apache.coyote.ProtocolHandler
 import org.apache.coyote.http11.AbstractHttp11JsseProtocol;
 import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl;
+import org.apache.tomcat.websocket.server.WsListener;
 
 /**
  * The keys and 

svn commit: r1475807 - in /tomcat/trunk/test/org/apache/catalina/servlets: TestDefaultServlet.java TestWebdavServlet.java

2013-04-25 Thread markt
Author: markt
Date: Thu Apr 25 14:51:17 2013
New Revision: 1475807

URL: http://svn.apache.org/r1475807
Log:
Fix some more unit test failures triggered by WebSocket init changes.

Modified:
tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java

Modified: tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java?rev=1475807r1=1475806r2=1475807view=diff
==
--- tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java Thu 
Apr 25 14:51:17 2013
@@ -43,6 +43,7 @@ import org.apache.catalina.startup.Simpl
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.websocket.server.WsListener;
 
 public class TestDefaultServlet extends TomcatBaseTest {
 
@@ -100,6 +101,7 @@ public class TestDefaultServlet extends 
 // app dir is relative to server home
 org.apache.catalina.Context ctx =
 tomcat.addWebapp(null, /examples, appDir.getAbsolutePath());
+ctx.addApplicationListener(WsListener.class.getName());
 
 // Override the default servlet with our own mappings
 Tomcat.addServlet(ctx, default2, new DefaultServlet());

Modified: tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java?rev=1475807r1=1475806r2=1475807view=diff
==
--- tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java Thu 
Apr 25 14:51:17 2013
@@ -30,6 +30,7 @@ import org.junit.Test;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.websocket.server.WsListener;
 
 public class TestWebdavServlet extends TomcatBaseTest {
 
@@ -93,6 +94,7 @@ public class TestWebdavServlet extends T
 
 Tomcat.addServlet(ctx, webdav, new WebdavServlet());
 ctx.addServletMapping(/webdav/*, webdav);
+ctx.addApplicationListener(WsListener.class.getName());
 
 tomcat.start();
 



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



[Bug 54882] HttpServletRequest.getRequestURI() returns also fragment

2013-04-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=54882

--- Comment #7 from Konstantin Preißer prei...@web.de ---
Hi,

note that IIS (7.5) does reject requests where the URL contains a fragment (but
no query string) like /test.html#fragment with a 400 Bad Request response.

I'm guessing you use the XmlHttpRequest for Ajax requests. While it is a bug of
IE to include a fragment in the request to the server, I wonder why you pass a
URL that includes a fragment to XmlHttpRequest. Does the fragment influence the
result returned from the XmlHttpRequest?

If not, then I think the workaround should be in the client instead of the
server: The JavaScripts should not pass a URL with a fragment to the
XmlHttpRequest.

-- 
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: r1475866 - /tomcat/tc6.0.x/trunk/STATUS.txt

2013-04-25 Thread rjung
Author: rjung
Date: Thu Apr 25 17:36:32 2013
New Revision: 1475866

URL: http://svn.apache.org/r1475866
Log:
Some votes, one comment.

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=1475866r1=1475865r2=1475866view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 25 17:36:32 2013
@@ -40,7 +40,7 @@ PATCHES PROPOSED TO BACKPORT:
   debug level.
 
   
http://people.apache.org/~kkolinko/patches/2013-03-24_tc6_52184_UserDataHelper.patch
-  +1: kkolinko
+  +1: kkolinko, rjung
   -1:
 
 * For https://issues.apache.org/bugzilla/show_bug.cgi?id=52055
@@ -63,7 +63,7 @@ PATCHES PROPOSED TO BACKPORT:
   that meant entries could be made with an earlier timestamp than the true 
timestamp.
   (The test was added to tomcat6-testing branch in r1408453)
   http://svn.apache.org/viewvc?view=revisionrevision=1408459
-  +1: kkolinko, markt
+  +1: kkolinko, markt, rjung
   -1:
 
 * Improve method cache handling in SecurityUtil class.
@@ -77,7 +77,7 @@ PATCHES PROPOSED TO BACKPORT:
   Avoid NPE with an empty SSI directive
   http://svn.apache.org/viewvc?view=revisionrevision=1430553
   (r1430550 in trunk)
-  +1: kkolinko, markt
+  +1: kkolinko, markt, rjung
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54456
@@ -85,7 +85,7 @@ PATCHES PROPOSED TO BACKPORT:
   application reading the request body.
   http://svn.apache.org/viewvc?rev=1443430view=rev
   (r1443427 in trunk)
-  +1: kkolinko, markt
+  +1: kkolinko, markt, rjung
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54527
@@ -100,7 +100,7 @@ PATCHES PROPOSED TO BACKPORT:
   configure logging, instead of modifying JAVA_OPTS one.
   https://issues.apache.org/bugzilla/attachment.cgi?id=29985
   (backport of r1449406; r1449412 in tc7)
-  +1: kkolinko
+  +1: kkolinko, rjung
   -1:
 
 * Add sample Apache Commons Daemon JSVC wrapper script bin/daemon.sh that
@@ -110,20 +110,23 @@ PATCHES PROPOSED TO BACKPORT:
   This copy of daemon.sh differs from Tomcat trunk one in initialization of
   CLASSPATH setting, because tomcat-juli.jar has to be handled differently.
   http://people.apache.org/~kkolinko/patches/2013-03-26_tc6_daemonsh.patch
-  +1: kkolinko, jfclere
+  +1: kkolinko, jfclere, rjung
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54615
   Update to Eclipse JDT Compiler 4.2.2
   http://people.apache.org/~kkolinko/patches/2013-03-26_tc6_eclipse422.patch
-  +1: kkolinko
+  +1: kkolinko, rjung
   -1:
 
 * Update the native component of the APR/native connector to 1.1.27 and
   make that version the recommended minimum version.
   http://svn.apache.org/r1445210
-  +1: kkolinko
+  +1: kkolinko, rjung
   -1:
+  rjung: The svn merge doesn't apply cleanly. You don't want to
+ change TCN_REQUIRED_PATCH or add TCN_RECOMMENDED_MINOR, correct?
+ Only increment TCN_RECOMMENDED_PV to 27?
 
 PATCHES/ISSUES THAT ARE STALLED
 



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



svn commit: r1475900 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java http11/Http11NioProcessor.java

2013-04-25 Thread markt
Author: markt
Date: Thu Apr 25 18:49:25 2013
New Revision: 1475900

URL: http://svn.apache.org/r1475900
Log:
Fix some NPEs observed while investigating some unit test failures.

Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1475900r1=1475899r2=1475900view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Apr 25 
18:49:25 2013
@@ -582,11 +582,16 @@ public abstract class AbstractProtocol i
 public SocketState process(SocketWrapperS wrapper,
 SocketStatus status) {
 S socket = wrapper.getSocket();
-ProcessorS processor = connections.get(socket);
 
+if (socket == null) {
+// Nothing to do. Socket has been closed.
+return SocketState.CLOSED;
+}
+
+ProcessorS processor = connections.get(socket);
 if (status == SocketStatus.DISCONNECT  processor == null) {
-//nothing more to be done endpoint requested a close
-//and there are no object associated with this connection
+// Nothing to do. Endpoint requested a close and there is no
+// longer a processor associated with this socket.
 return SocketState.CLOSED;
 }
 

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1475900r1=1475899r2=1475900view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Thu Apr 
25 18:49:25 2013
@@ -234,7 +234,7 @@ public class Http11NioProcessor extends 
 SocketState state = super.process(socketWrapper);
 final NioEndpoint.KeyAttachment attach = 
(NioEndpoint.KeyAttachment)socket.getSocket().getAttachment(false);
 //return if we have more data to write
-if (isRegisteredForWrite(attach)) {
+if (attach != null  isRegisteredForWrite(attach)) {
 return SocketState.LONG;
 } else {
 return state;



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



svn commit: r1475928 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java

2013-04-25 Thread markt
Author: markt
Date: Thu Apr 25 19:42:26 2013
New Revision: 1475928

URL: http://svn.apache.org/r1475928
Log:
Fix failing WebSocket unit tests after session closure refactoring

Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1475928r1=1475927r2=1475928view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java 
Thu Apr 25 19:42:26 2013
@@ -264,6 +264,18 @@ public class TestWsWebSocketContainer ex
 messages.get(0));
 }
 } else {
+// When the message exceeds the buffer size, the WebSocket is
+// closed. The endpoint ensures that the latch is cleared when the
+// WebSocket closes. However, the session isn't marked as closed
+// until after the onClose() method completes so there is a small
+// window where this test could fail. Therefore, wait briefly to
+// give the session a chance to complete the close process.
+for (int i = 0; i  500; i++) {
+if (!wsSession.isOpen()) {
+break;
+}
+Thread.sleep(10);
+}
 Assert.assertFalse(wsSession.isOpen());
 }
 }



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



svn commit: r1475930 - /tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java

2013-04-25 Thread markt
Author: markt
Date: Thu Apr 25 19:55:14 2013
New Revision: 1475930

URL: http://svn.apache.org/r1475930
Log:
Seeing some failures in 7.0.x. Reduce timeout to make them easier to repeat.

Modified:
tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java

Modified: tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java?rev=1475930r1=1475929r2=1475930view=diff
==
--- tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java Thu 
Apr 25 19:55:14 2013
@@ -323,7 +323,8 @@ public class TestVirtualContext extends 
 private void assertPageContains(String pageUrl, String expectedBody,
 int expectedStatus) throws IOException {
 ByteChunk res = new ByteChunk();
-int sc = getUrl(http://localhost:; + getPort() + pageUrl, res, null);
+int sc = getUrl(http://localhost:; + getPort() + pageUrl, res, 3000,
+null, null);
 
 assertEquals(expectedStatus, sc);
 



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



svn commit: r1475931 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/loader/TestVirtualContext.java

2013-04-25 Thread markt
Author: markt
Date: Thu Apr 25 19:56:29 2013
New Revision: 1475931

URL: http://svn.apache.org/r1475931
Log:
Seeing some failures in 7.0.x. Reduce timeout to make them easier to repeat.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestVirtualContext.java

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1475930

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestVirtualContext.java?rev=1475931r1=1475930r2=1475931view=diff
==
--- 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestVirtualContext.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestVirtualContext.java 
Thu Apr 25 19:56:29 2013
@@ -297,7 +297,8 @@ public class TestVirtualContext extends 
 private void assertPageContains(String pageUrl, String expectedBody,
 int expectedStatus) throws IOException {
 ByteChunk res = new ByteChunk();
-int sc = getUrl(http://localhost:; + getPort() + pageUrl, res, null);
+int sc = getUrl(http://localhost:; + getPort() + pageUrl, res, 3000,
+null, null);
 
 assertEquals(expectedStatus, sc);
 



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



[Bug 53547] javax.servlet.ServletResponse.setContentType( String ) mutates the given input

2013-04-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53547

James Velasco james.vela...@int.com changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
Version|7.0.29  |7.0.33
 Resolution|WONTFIX |---

--- Comment #2 from James Velasco james.vela...@int.com ---
New changes made to Tomcat 7.0.33 and later (7.0.39 latest tested at the time
of this comment, see release notes between #54068 and #54076 for change
details) now violate the RFC2616 contentType rules that was previously enforced
by #52188, and it may now insert spaces with were previoulsy removed per cited
RFC.

-- 
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



[Bug 53547] javax.servlet.ServletResponse.setContentType( String ) mutates the given input

2013-04-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53547

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

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |WONTFIX

--- Comment #3 from Mark Thomas ma...@apache.org ---
The LWS inserted by Tomcat is permitted by RFC2616. See the definition of
implied *LWS on page 14.

The definition of content type (section 14.7) is:
Content-Type   = Content-Type : media-type
with no LWS limits

Expanding media-type (section 3.7) gives:
Content-Type   = Content-Type : type / subtype *( ; parameter )
with the following LWS limits:
- LWS MUST NOT be used between the type and subtype
- LWS MUST NOT be used between an attribute and its value

Expanding parameter (section 3.6) gives:
Content-Type   = Content-Type : type / subtype *( ; attribute =
value)
with the following LWS limits:
- LWS MUST NOT be used between the type and subtype
- LWS MUST NOT be used between an attribute and its value

Tomcat inserts LWS after the ; and before attribute which is permitted by
RFC2616 under the implied *LWS rule since ; is a separator and attribute is a
token.

-- 
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: r1475968 - /tomcat/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java

2013-04-25 Thread markt
Author: markt
Date: Thu Apr 25 21:27:50 2013
New Revision: 1475968

URL: http://svn.apache.org/r1475968
Log:
Don't use port 8080 for unit tests

Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java

Modified: 
tomcat/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java?rev=1475968r1=1475967r2=1475968view=diff
==
--- tomcat/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java Thu 
Apr 25 21:27:50 2013
@@ -62,7 +62,6 @@ public class TestKeepAliveCount extends 
 tomcat.getConnector().setProperty(maxKeepAliveRequests, 5);
 tomcat.getConnector().setProperty(soTimeout, 2);
 tomcat.getConnector().setProperty(keepAliveTimeout, 5);
-tomcat.getConnector().setProperty(port, 8080);
 init = true;
 }
 
@@ -70,6 +69,8 @@ public class TestKeepAliveCount extends 
 Tomcat tomcat = getTomcatInstance();
 init();
 tomcat.start();
+setPort(tomcat.getConnector().getLocalPort());
+
 // Open connection
 connect();
 
@@ -91,6 +92,8 @@ public class TestKeepAliveCount extends 
 Tomcat tomcat = getTomcatInstance();
 init();
 tomcat.start();
+setPort(tomcat.getConnector().getLocalPort());
+
 // Open connection
 connect();
 



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



svn commit: r1475971 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/connector/TestKeepAliveCount.java webapps/docs/changelog.xml

2013-04-25 Thread markt
Author: markt
Date: Thu Apr 25 21:28:31 2013
New Revision: 1475971

URL: http://svn.apache.org/r1475971
Log:
Don't use port 8080 for unit tests

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1475968

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java?rev=1475971r1=1475970r2=1475971view=diff
==
--- 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java 
Thu Apr 25 21:28:31 2013
@@ -62,7 +62,6 @@ public class TestKeepAliveCount extends 
 tomcat.getConnector().setProperty(maxKeepAliveRequests, 5);
 tomcat.getConnector().setProperty(soTimeout, 2);
 tomcat.getConnector().setProperty(keepAliveTimeout, 5);
-tomcat.getConnector().setProperty(port, 8080);
 init = true;
 }
 
@@ -70,6 +69,8 @@ public class TestKeepAliveCount extends 
 Tomcat tomcat = getTomcatInstance();
 init();
 tomcat.start();
+setPort(tomcat.getConnector().getLocalPort());
+
 // Open connection
 connect();
 
@@ -91,6 +92,8 @@ public class TestKeepAliveCount extends 
 Tomcat tomcat = getTomcatInstance();
 init();
 tomcat.start();
+setPort(tomcat.getConnector().getLocalPort());
+
 // Open connection
 connect();
 

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1475971r1=1475970r2=1475971view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Apr 25 21:28:31 2013
@@ -60,12 +60,12 @@
 changelog
   update
 Update Tomcat's internal copy of Commons FileUpload to FileUpload 1.3.
-(markt) 
+(markt)
   /update
   fix
 bug54178/bug: Protect against codeAsyncListener/code
 implementations that throw codeRuntimeException/codes in response 
to
-an event. (markt) 
+an event. (markt)
   /fix
   fix
 bug54791/bug: Restore codetools.jar/code entry in



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