Re: Slides for ApacheCon EU Roadshow 2018

2018-06-30 Thread Mark Thomas
On 29/06/18 10:27, Leon Rosenberg wrote:
> This is not a wiki page, is it? So how do I add stuff there? ;-)

If you have somewhere you can host it, post the link here and one of the
committers will add it. If you prefer, post the PDF (or whatever) and it
can be hosted on the Tomcat site.

Mark


> Leon
> 
> On Wed, Jun 27, 2018 at 9:50 AM Rémy Maucherat  wrote:
> 
>> On Wed, Jun 27, 2018 at 9:39 AM Rainer Jung 
>> wrote:
>>
>>> Am 27.06.2018 um 01:40 schrieb Huxing Zhang:
 Hi All,

 I have check the presentation page[1] but could only find slide of
 Mark's "State of the Cat" topic.

 Do we have slides/recordings for the other topics?

 [1] http://tomcat.apache.org/presentations.html
>>>
>>> Thanks for asking. I just added my two presentations.
>>>
>>> More to come from others?
>>>
>>
>> That would be nice !
>>
>> Rémy
>>
> 


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



Re: Dynamic reloading of SSL certificates

2018-06-30 Thread Christopher Schultz
Mark,

On 6/29/18 5:06 PM, Mark Thomas wrote:
> On 29/06/18 21:58, Christopher Schultz wrote:
>> On 6/27/18 4:59 PM, Mark Thomas wrote:
>>> On 27/06/18 17:21, Christopher Schultz wrote:
> 
> 
> 
 any objection to taking this code and putting it into the
 Connector under the public method reloadSSLHostConfig to make it (a)
 accessible via JMX and (b) easy to access?
>>>
>>> Yes.
>>>
>>> The operations are already accessible via JMX on the ProtocolHandlers.
>>> As the refactoring has progressed there has been a steady shift away
>>> from duplicating attributes and methods between the Connector, Protocol
>>> and endpoint. I think there will always need to be some duplication but
>>> it has been trending downwards.
>>
>> The (somewhat related) operations I see on the ProtocolHandler are:
>>
>> findSslHostConfigs
>> addSslHostConfig
>>
>> Let's say I want to trigger a CRL or keystore reload via the
>> JMXProxyServlet. How would I go about doing that using the above
>> methods? Or am I missing something?
> 
> AbstractHttp11Protocol.reloadSslHostConfigs()
> AbstractHttp11Protocol.reloadSslHostConfig(String)
> 
> Ah! Those are only in 9.0.x. Are you looking at 8.5.x? It looks like a
> back-port is required.

Yes, sorry, I am indeed looking at 8.5.x. Back-ports would be greatly
appreciated.

As for the methods in Protocol + Connector, I'm okay keeping them in the
ProtocolHandler classes for the reasons you mention. The only problem is
that nobody will ever guess to look there, so we have to find a way to
document that in a way that will direct people to look there for the
appropriate runtime-related methods.

I'll take a look at the users guide as I prep for my Let's Encrypt
presentation for ApacheCon and hopefully make some improvements.

-chris



signature.asc
Description: OpenPGP digital signature


[Bug 62500] Add Shell Script to Create CATALINA_BASE Directories

2018-06-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62500

--- Comment #15 from Christopher Schultz  ---
(In reply to Igal Sapir from comment #13)
> While I could live with `ant`, I'd hate to make `Subversion` a requirement
> here (or anywhere, for that matter).

Oh, sure. I wasn't suggesting that /any/ revision-control system be a part of
any kind of "assisted build" that Tomcat might provide. I was just pointing-out
that it's very possible to build a CATALINA_BASE on depand as a part of an
application-installation process.

-- 
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 62273] Add support for alternate URL specification

2018-06-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62273

--- Comment #24 from Christopher Schultz  ---
(In reply to remmeier from comment #21)
> are there any security implications when relaxing a char like [ and ]?
> Because there are other specifications like JSON API making heavy use these
> two characters and if so, Tomcat just becomes no option anymore for such use
> cases.

Surely, you aren't using JSON in your URLs and query strings, are you? Le's
move this discussion to the users' mailing list.

-- 
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: r1834746 - /tomcat/jk/trunk/xdocs/webserver_howto/apache.xml

2018-06-30 Thread kkolinko
Author: kkolinko
Date: Sat Jun 30 16:00:51 2018
New Revision: 1834746

URL: http://svn.apache.org/viewvc?rev=1834746&view=rev
Log:
Fix a broken link in documentation.

Modified:
tomcat/jk/trunk/xdocs/webserver_howto/apache.xml

Modified: tomcat/jk/trunk/xdocs/webserver_howto/apache.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/webserver_howto/apache.xml?rev=1834746&r1=1834745&r2=1834746&view=diff
==
--- tomcat/jk/trunk/xdocs/webserver_howto/apache.xml (original)
+++ tomcat/jk/trunk/xdocs/webserver_howto/apache.xml Sat Jun 30 16:00:51 2018
@@ -40,7 +40,7 @@ It is recommended that you also read the
 Workers HowTo document
 to learn how to setup the working entities between your web server and Tomcat 
Engines.
 For more detailed configuration information consult the Reference Guide for
-workers.properties,
+workers.properties,
 uriworkermap
 and Apache.
 



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



svn commit: r1834747 - in /tomcat/site/trunk/docs/connectors-doc/webserver_howto: apache.html printer/apache.html

2018-06-30 Thread kkolinko
Author: kkolinko
Date: Sat Jun 30 16:03:02 2018
New Revision: 1834747

URL: http://svn.apache.org/viewvc?rev=1834747&view=rev
Log:
Fix a broken link in documentation.

Modified:
tomcat/site/trunk/docs/connectors-doc/webserver_howto/apache.html
tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/apache.html

Modified: tomcat/site/trunk/docs/connectors-doc/webserver_howto/apache.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/webserver_howto/apache.html?rev=1834747&r1=1834746&r2=1834747&view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/webserver_howto/apache.html (original)
+++ tomcat/site/trunk/docs/connectors-doc/webserver_howto/apache.html Sat Jun 
30 16:03:02 2018
@@ -11,7 +11,7 @@ It is recommended that you also read the
 Workers HowTo document
 to learn how to setup the working entities between your web server and Tomcat 
Engines.
 For more detailed configuration information consult the Reference Guide for
-workers.properties,
+workers.properties,
 uriworkermap
 and Apache.
 

Modified: 
tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/apache.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/apache.html?rev=1834747&r1=1834746&r2=1834747&view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/apache.html 
(original)
+++ tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/apache.html 
Sat Jun 30 16:03:02 2018
@@ -10,7 +10,7 @@ It is recommended that you also read the
 Workers HowTo document
 to learn how to setup the working entities between your web server and Tomcat 
Engines.
 For more detailed configuration information consult the Reference Guide for
-workers.properties,
+workers.properties,
 uriworkermap
 and Apache.
 



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



Re: Plans for AJP

2018-06-30 Thread Mark Thomas
On 27/06/18 18:09, Mark Thomas wrote:
> On 27/06/18 17:50, Rainer Jung wrote:



>> So what do people think about:
>>
>> 1) adding a statement to the mod_jk docs, that we don't plan any feature
>> enhancements and suggest users to migrate to mod_proxy_http and the TC
>> HTTP connectors (but what about IIS? I think there are reverse proxy
>> modules there as well?)
> 
> I believe there is, but we should investigate it a little first to see
> what the feature set is. I have a full set of current Windows OSes plus
> IIS VMs. I'm happy to look into this aspect.

I've spent a little bit of time looking at this.

My test environment is:

- 4 * Linux VMs running Tomcat trunk
- Clustered with Delta Manager
- Running a simple test app that reports current node, session ID, etc
- Windows 2016 with IIS 10

Microsoft provide a supported extension, Application Request Routing [1]
that can be used for load-balancing and/or reverse proxying.

After a little experimentation, I was able to configure it to act as a
combined load-balancer and reverse proxy for my 4 node Tomcat cluster.

I did some simple testing, including failover testing, and made the
following notes:

a) You can see the http and https ports to use with the back-end server
   when adding the server to the 'Server Farm'.
b) I haven't yet been able to find a way to view or edit those port
   settings once the 'Server Farm' has been created.
c) Failover and recovery is controlled by configuring the Health Test.
d) There is no concept of retrying a failed required on another node.
e) No pre request ping (neither has mod_proxy_http).
f) Sticky sessions possible via separate ARR cookie. No linkage with
   Tomcat session.


Of all of the above, d) is the one that concerns me the most. It means
that, after a node failure, at least one end-user is going to see a 5xx
response. [2] indicates that the IIS considered implementing retries but
decided not to because "nobody would use it". I disagree. There are some
scenarios where I wouldn't use it but also some where I would.

The question is, does this limitation provide sufficient justification
for continuing to support AJP and the ISAPI redirector?

The argument could be made that we drop AJP and if IIS users complain
about the lack of retries we point them to the IIS team. That does seem
a little harsh.

As a side note, the AJP code on Tomcat side is just under 800 lines of code.

Thoughts?

Mark


[1] https://www.iis.net/downloads/microsoft/application-request-routing
[2]
https://forums.iis.net/t/1161778.aspx?ARR+v2+RC+Monitoring+and+Management+Form+Failed+Request+Stats

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



[Bug 62273] Add support for alternate URL specification

2018-06-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62273

--- Comment #25 from remmeier  ---
no, just good to have that statement in terms of security for other people
because this thing here causes a gigantic amount of issues since it affects in
our case two dozen application with some beeing a bit larger and quite security
sensitive. All that for something nobody else seem to care much, browser
vendors included.

-- 
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: r1834760 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/manager/ java/org/apache/coyote/http11/ webapps/docs/

2018-06-30 Thread markt
Author: markt
Date: Sat Jun 30 20:02:38 2018
New Revision: 1834760

URL: http://svn.apache.org/viewvc?rev=1834760&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61565
Add the ability to trigger a reloading of TLS host configuration (certificate 
and key files, server.xml is not re-parsed) via the Manager web application.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)

tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java

tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/manager-howto.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 30 20:02:38 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,176157

[Bug 61565] Manager interface for reloading TLS config

2018-06-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61565

--- Comment #4 from Mark Thomas  ---
Added to 8.5.x for 8.5.32 onwards.

-- 
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: Dynamic reloading of SSL certificates

2018-06-30 Thread Mark Thomas
On 30/06/18 16:27, Christopher Schultz wrote:
> On 6/29/18 5:06 PM, Mark Thomas wrote:



>> Ah! Those are only in 9.0.x. Are you looking at 8.5.x? It looks like a
>> back-port is required.
> 
> Yes, sorry, I am indeed looking at 8.5.x. Back-ports would be greatly
> appreciated.

Done.

> As for the methods in Protocol + Connector, I'm okay keeping them in the
> ProtocolHandler classes for the reasons you mention. The only problem is
> that nobody will ever guess to look there, so we have to find a way to
> document that in a way that will direct people to look there for the
> appropriate runtime-related methods.
> 
> I'll take a look at the users guide as I prep for my Let's Encrypt
> presentation for ApacheCon and hopefully make some improvements.

Sounds good.

Mark

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



[Bug 62501] Race condition (?) in session attribute replication

2018-06-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62501

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
There is a fix for this in 9.0.9.

The fix isn't perfect but I could reproduce this 100% of the time before the
fix and not at all after the fix. So, while the race is still theoretically
possible, the issue is currently considered resolved.

If you still see the issue, feel free to re-open it and we can take another
look although options for addressing it are fairly limited.

-- 
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: r1834761 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java

2018-06-30 Thread markt
Author: markt
Date: Sat Jun 30 20:27:18 2018
New Revision: 1834761

URL: http://svn.apache.org/viewvc?rev=1834761&view=rev
Log:
Trivial whitespace clean-up to trigger CI build

Modified:

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java?rev=1834761&r1=1834760&r2=1834761&view=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
 Sat Jun 30 20:27:18 2018
@@ -14,11 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina.authenticator;
 
-
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -34,8 +31,6 @@ import org.apache.tomcat.util.buf.ByteCh
 import org.apache.tomcat.util.buf.MessageBytes;
 import org.apache.tomcat.util.codec.binary.Base64;
 
-
-
 /**
  * An Authenticator and Valve implementation of HTTP BASIC
  * Authentication, as outlined in RFC 2617:  "HTTP Authentication: Basic



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



[Bug 62498] FileDirContext validate not working properly for directories

2018-06-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62498

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEEDINFO|RESOLVED

--- Comment #6 from Mark Thomas  ---
Fixed in 7.0.x for 7.0.90 onwards.

-- 
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: r1834763 - in /tomcat/tc7.0.x/trunk: java/org/apache/naming/resources/VirtualDirContext.java test/org/apache/naming/resources/TestVirtualDirContext.java webapps/docs/changelog.xml

2018-06-30 Thread markt
Author: markt
Date: Sat Jun 30 20:40:20 2018
New Revision: 1834763

URL: http://svn.apache.org/viewvc?rev=1834763&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62498
Correct a regression in the fix for CVE-2017-12617 that caused request failures 
for some requests when using the VirtualDirContext.

Added:

tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestVirtualDirContext.java
   (with props)
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java?rev=1834763&r1=1834762&r2=1834763&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java 
Sat Jun 30 20:40:20 2018
@@ -212,7 +212,8 @@ public class VirtualDirContext extends F
 }
 }
 }
-if (name.startsWith(path + "/")) {
+path += "/";
+if (name.startsWith(path)) {
 String res = name.substring(path.length());
 for (String resourcesDir : dirList) {
 file = new File(resourcesDir, res);

Added: 
tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestVirtualDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestVirtualDirContext.java?rev=1834763&view=auto
==
--- 
tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestVirtualDirContext.java
 (added)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestVirtualDirContext.java
 Sat Jun 30 20:40:20 2018
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.naming.resources;
+
+import java.io.File;
+
+import javax.naming.NamingException;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.startup.LoggingBaseTest;
+
+public class TestVirtualDirContext {
+
+@Test
+public void testBug62498() throws NamingException {
+VirtualDirContext vdc = new VirtualDirContext();
+// No docBase
+vdc.setExtraResourcePaths("/=" + 
LoggingBaseTest.getBuildDirectory().getAbsolutePath());
+
+vdc.allocate();
+
+File f1 = vdc.file("");
+Assert.assertNotNull(f1);
+File f2 = vdc.file("/");
+Assert.assertNotNull(f2);
+Assert.assertEquals(f1.getAbsolutePath(), f2.getAbsolutePath());
+
+Object obj1 = vdc.lookup("");
+Assert.assertTrue(obj1 instanceof FileDirContext);
+Object obj2 = vdc.lookup("/");
+Assert.assertTrue(obj2 instanceof FileDirContext);
+Assert.assertEquals(((FileDirContext) obj1).absoluteBase, 
((FileDirContext) obj2).absoluteBase);
+}
+
+
+@Test
+public void testBug62498a() {
+VirtualDirContext vdc = new VirtualDirContext();
+// No docBase
+vdc.setExtraResourcePaths("/=" + 
LoggingBaseTest.getBuildDirectory().getAbsolutePath());
+
+vdc.allocate();
+
+File f1 = vdc.file("");
+Assert.assertNotNull(f1);
+}
+
+
+@Test
+public void testBug62498b() {
+VirtualDirContext vdc = new VirtualDirContext();
+// No docBase
+vdc.setExtraResourcePaths("/=" + 
LoggingBaseTest.getBuildDirectory().getAbsolutePath());
+
+vdc.allocate();
+
+File f2 = vdc.file("/");
+Assert.assertNotNull(f2);
+}
+
+
+@Test
+public void testBug62498c() throws NamingException {
+VirtualDirContext vdc = new VirtualDirContext();
+// No docBase
+vdc.setExtraResourcePaths("/=" + 
LoggingBaseTest.getBuildDirectory().getAbsolutePath());
+
+vdc.allocate();
+
+Object obj1 = vdc.lookup("");
+Assert.assertTrue(obj1 instanceof FileDirContext);
+}
+
+
+@Test
+public void t

svn commit: r1834765 - /tomcat/tc8.5.x/trunk/build.xml

2018-06-30 Thread markt
Author: markt
Date: Sat Jun 30 20:45:26 2018
New Revision: 1834765

URL: http://svn.apache.org/viewvc?rev=1834765&view=rev
Log:
Switch back to http for Javadoc as https causes build failures.

Modified:
tomcat/tc8.5.x/trunk/build.xml

Modified: tomcat/tc8.5.x/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.xml?rev=1834765&r1=1834764&r2=1834765&view=diff
==
--- tomcat/tc8.5.x/trunk/build.xml (original)
+++ tomcat/tc8.5.x/trunk/build.xml Sat Jun 30 20:45:26 2018
@@ -1889,7 +1889,7 @@ Apache Tomcat ${version} native binaries
   
   
   http://docs.oracle.com/javase/7/docs/api/"/>
-  https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+  http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
   http://docs.oracle.com/javaee/7/api/"/>
   
 



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



Re: Slides for ApacheCon EU Roadshow 2018

2018-06-30 Thread Huxing Zhang
>From the youtube playlist[1] of Apache EU roadshow, I can see Rainer's
topic about Apache Web Server[2].

But I did not find any tomcat related topics there.

So I guess not every talk is getting recorded?

[1] https://www.youtube.com/playlist?list=PLU2OcwpQkYCyuV8Fza7dVAEg5FW2Pzg-8
[2] 
https://www.youtube.com/watch?v=MRx0PZilMBY&index=15&list=PLU2OcwpQkYCyuV8Fza7dVAEg5FW2Pzg-8&t=219s

On Wed, Jun 27, 2018 at 3:39 PM, Rainer Jung  wrote:
> Am 27.06.2018 um 01:40 schrieb Huxing Zhang:
>>
>> Hi All,
>>
>> I have check the presentation page[1] but could only find slide of
>> Mark's "State of the Cat" topic.
>>
>> Do we have slides/recordings for the other topics?
>>
>> [1] http://tomcat.apache.org/presentations.html
>
>
> Thanks for asking. I just added my two presentations.
>
> More to come from others?
>
> Regards,
>
> Rainer
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>



-- 
Best Regards!
Huxing

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