svn commit: r1545558 - /tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java

2013-11-25 Thread jboynes
Author: jboynes Date: Tue Nov 26 07:04:42 2013 New Revision: 1545558 URL: http://svn.apache.org/r1545558 Log: Convert JspDocumentParser to an DefaultHandler2 Added TODO on using JarFactory to resolve Tomcat-specific URLs returned by the Jar abstraction. Still need to figure how to do that. Modi

svn commit: r1545553 - in /tomcat/trunk: java/org/apache/jasper/compiler/JspDocumentParser.java java/org/apache/jasper/compiler/JspUtil.java test/org/apache/jasper/compiler/TestJspDocumentParser.java

2013-11-25 Thread jboynes
Author: jboynes Date: Tue Nov 26 06:30:07 2013 New Revision: 1545553 URL: http://svn.apache.org/r1545553 Log: use an InputSource in JspDocumentParser to provide a base URI for resolution Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java tomcat/trunk/java/org/ap

Re: svn commit: r1544165 - XML validation

2013-11-25 Thread Jeremy Boynes
On Nov 21, 2013, at 7:16 PM, Jeremy Boynes wrote: > On Nov 21, 2013, at 4:59 AM, ma...@apache.org wrote: > >> Author: markt >> Date: Thu Nov 21 12:59:36 2013 >> New Revision: 1544165 >> >> URL: http://svn.apache.org/r1544165 >> Log: >> Extend the reach of the Context attribute xmlValidation to

[Bug 55799] [websocket] Stability issues when concurrently sending large messages

2013-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=55799 Konstantin Kolinko changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|F

svn commit: r1545537 - in /tomcat/trunk/test: org/apache/jasper/compiler/TestJspDocumentParser.java webapp/valid.jspx webapp/valid.xsd

2013-11-25 Thread jboynes
Author: jboynes Date: Tue Nov 26 04:30:45 2013 New Revision: 1545537 URL: http://svn.apache.org/r1545537 Log: add testcase to show problem with XSD validation of JSP documents Added: tomcat/trunk/test/webapp/valid.jspx (with props) tomcat/trunk/test/webapp/valid.xsd (with props) Modif

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

2013-11-25 Thread kkolinko
Author: kkolinko Date: Tue Nov 26 02:19:07 2013 New Revision: 1545508 URL: http://svn.apache.org/r1545508 Log: 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=1545508&r1=1545507&r2

Re: svn commit: r1545084 - /tomcat/trunk/build.xml

2013-11-25 Thread Konstantin Kolinko
2013/11/25 Mark Thomas : > On 24/11/2013 22:07, kkoli...@apache.org wrote: >> Author: kkolinko >> Date: Sun Nov 24 22:07:08 2013 >> New Revision: 1545084 >> >> URL: http://svn.apache.org/r1545084 >> Log: >> Exclude AprSocket class from instrumentation. >> >> Cobertura fails to instrument it, becaus

buildbot success in ASF Buildbot on tomcat-7-trunk

2013-11-25 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1586 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build So

svn commit: r1545504 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/jndi-resources-howto.xml

2013-11-25 Thread kkolinko
Author: kkolinko Date: Tue Nov 26 01:41:04 2013 New Revision: 1545504 URL: http://svn.apache.org/r1545504 Log: Merged r1545215 from tomcat/trunk: Fix typos Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml Propchange: tomcat/tc7.

svn commit: r1545497 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/host.xml

2013-11-25 Thread kkolinko
Author: kkolinko Date: Tue Nov 26 01:27:27 2013 New Revision: 1545497 URL: http://svn.apache.org/r1545497 Log: Merged r1491890 from tomcat/trunk: Followup to r1491596 Restore omitted attribute name. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/confi

svn commit: r1545496 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/LocalStrings.properties webapps/docs/changelog.xml

2013-11-25 Thread kkolinko
Author: kkolinko Date: Tue Nov 26 01:24:30 2013 New Revision: 1545496 URL: http://svn.apache.org/r1545496 Log: Merged r1545480 from tomcat/trunk: Correct typo in a message I removed a duplicate changelog entry and split a long sentence. Modified: tomcat/tc7.0.x/trunk/ (props changed)

svn commit: r1545482 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java

2013-11-25 Thread markt
Author: markt Date: Tue Nov 26 00:53:09 2013 New Revision: 1545482 URL: http://svn.apache.org/r1545482 Log: Fix bug in r1545481 backport Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.

svn commit: r1545481 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ test/org/apache/catalina/startup/ webapps/docs/ webapps/docs/config/

2013-11-25 Thread markt
Author: markt Date: Tue Nov 26 00:51:05 2013 New Revision: 1545481 URL: http://svn.apache.org/r1545481 Log: Prevent a web application from deploying if it contains a context.xml, deployXML is false and there is no explicit descriptor as the descriptor may contain necessary security information.

svn commit: r1545480 - /tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties

2013-11-25 Thread kkolinko
Author: kkolinko Date: Tue Nov 26 00:51:04 2013 New Revision: 1545480 URL: http://svn.apache.org/r1545480 Log: Correct typo in a message Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.proper

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

2013-11-25 Thread kkolinko
Author: kkolinko Date: Tue Nov 26 00:44:11 2013 New Revision: 1545475 URL: http://svn.apache.org/r1545475 Log: Correct typo, fix missing '>' in a tag. Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.o

svn commit: r1545474 - in /tomcat/site/trunk: docs/migration-7.html xdocs/migration-7.xml

2013-11-25 Thread markt
Author: markt Date: Tue Nov 26 00:43:03 2013 New Revision: 1545474 URL: http://svn.apache.org/r1545474 Log: Update migration docs for BZ 51294 Modified: tomcat/site/trunk/docs/migration-7.html tomcat/site/trunk/xdocs/migration-7.xml Modified: tomcat/site/trunk/docs/migration-7.html URL:

buildbot failure in ASF Buildbot on tomcat-7-trunk

2013-11-25 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1585 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Sourc

buildbot success in ASF Buildbot on tomcat-7-trunk

2013-11-25 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1584 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build So

[Bug 51294] Since 7.0.12 do not work option unpackWARs=true for WARs outside appBase

2013-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51294 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|---

Re: svn commit: r1545462 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ test/deployment/ test/org/apache/catalina/startup/

2013-11-25 Thread Mark Thomas
On 26/11/2013 00:05, Konstantin Kolinko wrote: > 2013/11/26 : >> Author: markt >> Date: Mon Nov 25 23:55:31 2013 >> New Revision: 1545462 >> >> URL: http://svn.apache.org/r1545462 >> Log: >> Backport automatic deployment changes part 19 >> Add support for a per Context copyXML attribute > > There

svn commit: r1545472 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/context.xml

2013-11-25 Thread markt
Author: markt Date: Tue Nov 26 00:32:47 2013 New Revision: 1545472 URL: http://svn.apache.org/r1545472 Log: Document new attribute Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml Pr

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

2013-11-25 Thread markt
Author: markt Date: Tue Nov 26 00:28:05 2013 New Revision: 1545471 URL: http://svn.apache.org/r1545471 Log: Document new attribute Modified: tomcat/trunk/webapps/docs/config/context.xml Modified: tomcat/trunk/webapps/docs/config/context.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/web

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

2013-11-25 Thread kkolinko
Author: kkolinko Date: Tue Nov 26 00:26:19 2013 New Revision: 1545470 URL: http://svn.apache.org/r1545470 Log: 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=1545470&r1=1545469&r

svn propchange: r1521040 - svn:log

2013-11-25 Thread kkolinko
Author: kkolinko Revision: 1521040 Modified property: svn:log Modified: svn:log at Tue Nov 26 00:22:49 2013 -- --- svn:log (original) +++ svn:log Tue Nov 26 00:22:49 2013 @@ -1,5 +1,5 @@ Preparation for fixing BZ 55534 A

svn commit: r1545468 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/startup/HostConfig.java test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java webapps/docs/config/automatic-

2013-11-25 Thread markt
Author: markt Date: Tue Nov 26 00:19:55 2013 New Revision: 1545468 URL: http://svn.apache.org/r1545468 Log: Backport automatic deployment changes part 21 Review diff with trunk and add missing changes Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java tomcat/

svn commit: r1545467 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java

2013-11-25 Thread markt
Author: markt Date: Tue Nov 26 00:19:07 2013 New Revision: 1545467 URL: http://svn.apache.org/r1545467 Log: Correct comment Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java URL: http://svn.apache.

Re: svn commit: r1545462 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ test/deployment/ test/org/apache/catalina/startup/

2013-11-25 Thread Konstantin Kolinko
2013/11/26 : > Author: markt > Date: Mon Nov 25 23:55:31 2013 > New Revision: 1545462 > > URL: http://svn.apache.org/r1545462 > Log: > Backport automatic deployment changes part 19 > Add support for a per Context copyXML attribute There is no documentation for this new attribute. It is not mentio

svn commit: r1545463 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/automatic-deployment.xml webapps/docs/config/host.xml

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 23:57:40 2013 New Revision: 1545463 URL: http://svn.apache.org/r1545463 Log: Backport automatic deployment changes part 20 Document the expected behaviour Added: tomcat/tc7.0.x/trunk/webapps/docs/config/automatic-deployment.xml - copied, changed from r1491

buildbot failure in ASF Buildbot on tomcat-7-trunk

2013-11-25 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1583 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Sourc

svn commit: r1545462 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ test/deployment/ test/org/apache/catalina/startup/

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 23:55:31 2013 New Revision: 1545462 URL: http://svn.apache.org/r1545462 Log: Backport automatic deployment changes part 19 Add support for a per Context copyXML attribute Added: tomcat/tc7.0.x/trunk/test/deployment/contextCopyXMLFalse.war - copied unchange

svn commit: r1545456 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 23:32:03 2013 New Revision: 1545456 URL: http://svn.apache.org/r1545456 Log: Backport automatic deployment changes part 18 Fix test failures when the file timestamp hadn't moved far enough for the OS to report it as changed. Modified: tomcat/tc7.0.x/trunk/ (p

svn commit: r1545455 - in /tomcat/tc7.0.x/trunk: ./ test/deployment/broken.war test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 23:30:47 2013 New Revision: 1545455 URL: http://svn.apache.org/r1545455 Log: Backport automatic deployment changes part 17 Add test cases for failed start when anti-resource locking is in use Added: tomcat/tc7.0.x/trunk/test/deployment/broken.war - copied,

svn commit: r1545454 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 23:24:08 2013 New Revision: 1545454 URL: http://svn.apache.org/r1545454 Log: Backport automatic deployment changes part 16 Enable remaining tests Fix failures Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/catalina/st

svn commit: r1545453 - in /tomcat/tc7.0.x/trunk: ./ test/deployment/contextUnpackWARFalse.war test/deployment/contextUnpackWARTrue.war test/org/apache/catalina/startup/TestHostConfigAutomaticDeploymen

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 23:21:35 2013 New Revision: 1545453 URL: http://svn.apache.org/r1545453 Log: Backport automatic deployment changes part 15 Add test cases for setting unpackWAR on the context Added: tomcat/tc7.0.x/trunk/test/deployment/contextUnpackWARFalse.war - copied un

svn commit: r1545452 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 23:18:13 2013 New Revision: 1545452 URL: http://svn.apache.org/r1545452 Log: Backport automatic deployment changes part 14 Complete the addition tests Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/Te

buildbot success in ASF Buildbot on tomcat-7-trunk

2013-11-25 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1582 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build So

svn commit: r1545451 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/HostConfig.java

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 23:13:37 2013 New Revision: 1545451 URL: http://svn.apache.org/r1545451 Log: Backport automatic deployment changes part 13 Add dummy reload resources to trigger a reload if a WAR or DIR is added to an XML Add dummy redploy resources to trigger a redeploy if an XML i

svn commit: r1545450 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/HostConfig.java test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 23:12:02 2013 New Revision: 1545450 URL: http://svn.apache.org/r1545450 Log: Backport automatic deployment changes part 12 More tests for addition Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostCon

svn commit: r1545446 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 23:05:37 2013 New Revision: 1545446 URL: http://svn.apache.org/r1545446 Log: Backport automatic deployment changes part 11 Start the tests for additions Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/

svn commit: r1545438 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ test/org/apache/catalina/startup/

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 22:58:04 2013 New Revision: 1545438 URL: http://svn.apache.org/r1545438 Log: Backport automatic deployment changes part 10 Complete tests for modification Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup

[Bug 51294] Since 7.0.12 do not work option unpackWARs=true for WARs outside appBase

2013-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51294 --- Comment #25 from Konstantin Kolinko --- These fixes are currently being ported to Tomcat 7, to be in 7.0.48. A note: Do not forget to update the note in the migration guide, once this fix is completed. http://tomcat.apache.org/migratio

svn commit: r1545435 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 22:41:35 2013 New Revision: 1545435 URL: http://svn.apache.org/r1545435 Log: Backport automatic deployment changes part 9 Add another test Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestHostConfig

svn commit: r1545433 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 22:40:09 2013 New Revision: 1545433 URL: http://svn.apache.org/r1545433 Log: Backport automatic deployment changes part 8 Start the modification tests Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/Te

svn propchange: r1545418 - svn:log

2013-11-25 Thread kkolinko
Author: kkolinko Revision: 1545418 Modified property: svn:log Modified: svn:log at Mon Nov 25 22:38:54 2013 -- --- svn:log (original) +++ svn:log Mon Nov 25 22:38:54 2013 @@ -1,2 +1,6 @@ +1. Merge r1482591 Backport automa

svn commit: r1545431 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 22:34:26 2013 New Revision: 1545431 URL: http://svn.apache.org/r1545431 Log: Backport automatic deployment changes part 8 Complete the deletion tests. Note some tests commenting out pending the back-port of the necessary fixes Modified: tomcat/tc7.0.x/trunk/ (

svn commit: r1545425 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 22:22:22 2013 New Revision: 1545425 URL: http://svn.apache.org/r1545425 Log: Backport automatic deployment changes part 7 More deployment tests Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestHostC

svn commit: r1545424 - /tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 22:19:53 2013 New Revision: 1545424 URL: http://svn.apache.org/r1545424 Log: Remove Java 7 dependency Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalin

[jira] [Commented] (MTOMCAT-249) Tomcat7:run fails to bring in JDBC class using JNDI Tomcat6:run works

2013-11-25 Thread *$^¨%`£
[ https://issues.apache.org/jira/browse/MTOMCAT-249?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13831977#comment-13831977 ] Olivier Lamy (*$^¨%`£) commented on MTOMCAT-249: With 2.2 ? > Tomcat7:ru

svn commit: r1545418 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/HostConfig.java test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 22:00:13 2013 New Revision: 1545418 URL: http://svn.apache.org/r1545418 Log: Backport automatic deployment changes part 6 Add the first part of the deletion tests for the auto-deployer. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/j

svn commit: r1545416 - in /tomcat/trunk: java/org/apache/catalina/startup/HostConfig.java test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 21:52:57 2013 New Revision: 1545416 URL: http://svn.apache.org/r1545416 Log: Ensure that the Host's contextClassName attribute is used when parsing descriptors that do not define one. Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java

buildbot failure in ASF Buildbot on tomcat-7-trunk

2013-11-25 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1580 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Sourc

svn commit: r1545405 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 20:54:33 2013 New Revision: 1545405 URL: http://svn.apache.org/r1545405 Log: Backport automatic deployment changes part 5 Complete the implementation of the deployment tests Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apa

svn commit: r1545404 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 20:52:54 2013 New Revision: 1545404 URL: http://svn.apache.org/r1545404 Log: Backport automatic deployment changes part 4 Add tests for WAR+XML based deployments. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/catalin

svn commit: r1545403 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 20:51:09 2013 New Revision: 1545403 URL: http://svn.apache.org/r1545403 Log: Backport automatic deployment changes part 3 Initial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=51294 This is an initial implementation that includes some but not all the ant

buildbot success in ASF Buildbot on tomcat-trunk

2013-11-25 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/5265 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source

svn commit: r1545398 - in /tomcat/tc7.0.x/trunk: ./ test/deployment/context.xml test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 20:42:08 2013 New Revision: 1545398 URL: http://svn.apache.org/r1545398 Log: Backport automatic deployment changes part 2 Initial test cases Added: tomcat/tc7.0.x/trunk/test/deployment/context.xml - copied unchanged from r1545256, tomcat/trunk/test/deploym

svn commit: r1545397 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 20:41:25 2013 New Revision: 1545397 URL: http://svn.apache.org/r1545397 Log: Backport automatic deployment changes part 1 If the resources fail to start, trigger a LifecycleException to align behaviour with Tomcat 8 Modified: tomcat/tc7.0.x/trunk/java/org/apach

[jira] [Updated] (MTOMCAT-249) Tomcat7:run fails to bring in JDBC class using JNDI Tomcat6:run works

2013-11-25 Thread Gilberto C Andrade (JIRA)
[ https://issues.apache.org/jira/browse/MTOMCAT-249?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Gilberto C Andrade updated MTOMCAT-249: --- Attachment: MTOMCAT-249.zip Just run mvn clean tomcat7:run and hit the browser with

svn commit: r1545388 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 20:15:10 2013 New Revision: 1545388 URL: http://svn.apache.org/r1545388 Log: Avoid possible NPE Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java

svn commit: r1545387 - /tomcat/trunk/java/org/apache/catalina/core/StandardContext.java

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 20:14:34 2013 New Revision: 1545387 URL: http://svn.apache.org/r1545387 Log: Remove unused code. Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java URL: http://svn

svn commit: r1545377 - in /tomcat/trunk: test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java webapps/docs/config/automatic-deployment.xml webapps/docs/config/host.xml

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 19:43:06 2013 New Revision: 1545377 URL: http://svn.apache.org/r1545377 Log: Update unit tests and documentation now that deployment fails if deployXML is true and the application has an embedded context.xml Modified: tomcat/trunk/test/org/apache/catalina/star

[jira] [Created] (MTOMCAT-249) Tomcat7:run fails to bring in JDBC class using JNDI Tomcat6:run works

2013-11-25 Thread Gilberto C Andrade (JIRA)
Gilberto C Andrade created MTOMCAT-249: -- Summary: Tomcat7:run fails to bring in JDBC class using JNDI Tomcat6:run works Key: MTOMCAT-249 URL: https://issues.apache.org/jira/browse/MTOMCAT-249 Pro

[jira] [Commented] (MTOMCAT-152) Tomcat6 run works but Tomcat7 run fails with JDBC driver error

2013-11-25 Thread Gilberto C Andrade (JIRA)
[ https://issues.apache.org/jira/browse/MTOMCAT-152?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13831627#comment-13831627 ] Gilberto C Andrade commented on MTOMCAT-152: is referring to this stackoverfl

Re: buildbot failure in ASF Buildbot on tomcat-trunk

2013-11-25 Thread Mark Thomas
On 25/11/2013 16:11, build...@apache.org wrote: > The Buildbot has detected a new failure on builder tomcat-trunk while > building ASF Buildbot. > Full details are available at: > http://ci.apache.org/builders/tomcat-trunk/builds/5264 > > Buildbot URL: http://ci.apache.org/ > > Buildslave for t

buildbot failure in ASF Buildbot on tomcat-trunk

2013-11-25 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/5264 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source St

[jira] [Commented] (MTOMCAT-238) Parameter staticContextDocbase cant be used

2013-11-25 Thread Laurent GARCIA (JIRA)
[ https://issues.apache.org/jira/browse/MTOMCAT-238?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13831550#comment-13831550 ] Laurent GARCIA commented on MTOMCAT-238: Here my configuration if you need it :

buildbot success in ASF Buildbot on tomcat-7-trunk

2013-11-25 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1578 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build So

svn commit: r1545288 - in /tomcat/trunk/java/org/apache/catalina/startup: HostConfig.java LocalStrings.properties

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 14:06:06 2013 New Revision: 1545288 URL: http://svn.apache.org/r1545288 Log: Prevent a web application from deploying if it contains a context.xml, deployXML is false and there is no explicit descriptor as the descriptor may contain necessary security information.

svn commit: r1545285 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 13:59:04 2013 New Revision: 1545285 URL: http://svn.apache.org/r1545285 Log: Fix logic error that meant that unpackWARs was ignored if a WAR failed to deploy (since the Context is an instance of FailedContext in that case) Modified: tomcat/tc7.0.x/trunk/ (pro

svn commit: r1545284 - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 13:55:34 2013 New Revision: 1545284 URL: http://svn.apache.org/r1545284 Log: Fix logic error that meant that unpackWARs was ignored if a WAR failed to deploy (since the Context is an instance of FailedContext in that case) Modified: tomcat/trunk/java/org/apache

svn commit: r1545262 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/security-howto.xml

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 13:25:49 2013 New Revision: 1545262 URL: http://svn.apache.org/r1545262 Log: Fix trailing whitespace Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/security-howto.xml Propchange: tomcat/tc7.0.x/trunk/ ---

svn commit: r1545261 - /tomcat/trunk/webapps/docs/security-howto.xml

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 13:25:12 2013 New Revision: 1545261 URL: http://svn.apache.org/r1545261 Log: Fix trailing whitespace Modified: tomcat/trunk/webapps/docs/security-howto.xml Modified: tomcat/trunk/webapps/docs/security-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/we

Re: svn commit: r1545213 - in /tomcat/trunk: java/org/apache/catalina/core/StandardHost.java webapps/docs/config/host.xml webapps/docs/security-howto.xml

2013-11-25 Thread Mark Thomas
On 25/11/2013 12:07, Konstantin Kolinko wrote: > 2013/11/25 Mark Thomas : >> On 25/11/2013 11:29, Konstantin Kolinko wrote: >>> 2013/11/25 : Author: markt Date: Mon Nov 25 10:26:26 2013 New Revision: 1545213 URL: http://svn.apache.org/r1545213 Log: When running u

Re: svn commit: r1545213 - in /tomcat/trunk: java/org/apache/catalina/core/StandardHost.java webapps/docs/config/host.xml webapps/docs/security-howto.xml

2013-11-25 Thread Konstantin Kolinko
2013/11/25 Mark Thomas : > On 25/11/2013 11:29, Konstantin Kolinko wrote: >> 2013/11/25 : >>> Author: markt >>> Date: Mon Nov 25 10:26:26 2013 >>> New Revision: 1545213 >>> >>> URL: http://svn.apache.org/r1545213 >>> Log: >>> When running under a security manager disabled deployXML by default. >>>

Re: svn commit: r1545213 - in /tomcat/trunk: java/org/apache/catalina/core/StandardHost.java webapps/docs/config/host.xml webapps/docs/security-howto.xml

2013-11-25 Thread Mark Thomas
On 25/11/2013 11:29, Konstantin Kolinko wrote: > 2013/11/25 : >> Author: markt >> Date: Mon Nov 25 10:26:26 2013 >> New Revision: 1545213 >> >> URL: http://svn.apache.org/r1545213 >> Log: >> When running under a security manager disabled deployXML by default. >> > > +1. > > Note, that > The mana

Re: svn commit: r1545213 - in /tomcat/trunk: java/org/apache/catalina/core/StandardHost.java webapps/docs/config/host.xml webapps/docs/security-howto.xml

2013-11-25 Thread Konstantin Kolinko
2013/11/25 : > Author: markt > Date: Mon Nov 25 10:26:26 2013 > New Revision: 1545213 > > URL: http://svn.apache.org/r1545213 > Log: > When running under a security manager disabled deployXML by default. > +1. Note, that The manager application in its default configuration will stop working The

buildbot failure in ASF Buildbot on tomcat-7-trunk

2013-11-25 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1577 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Sourc

svn commit: r1545215 - /tomcat/trunk/webapps/docs/jndi-resources-howto.xml

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 10:49:40 2013 New Revision: 1545215 URL: http://svn.apache.org/r1545215 Log: Fix typos Modified: tomcat/trunk/webapps/docs/jndi-resources-howto.xml Modified: tomcat/trunk/webapps/docs/jndi-resources-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/weba

svn commit: r1545214 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/StandardHost.java webapps/docs/changelog.xml webapps/docs/config/host.xml webapps/docs/security-howto.xml

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 10:30:24 2013 New Revision: 1545214 URL: http://svn.apache.org/r1545214 Log: When running under a security manager disabled deployXML by default. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHos

svn commit: r1545213 - in /tomcat/trunk: java/org/apache/catalina/core/StandardHost.java webapps/docs/config/host.xml webapps/docs/security-howto.xml

2013-11-25 Thread markt
Author: markt Date: Mon Nov 25 10:26:26 2013 New Revision: 1545213 URL: http://svn.apache.org/r1545213 Log: When running under a security manager disabled deployXML by default. Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java tomcat/trunk/webapps/docs/config/host.xml

Re: svn commit: r1545084 - /tomcat/trunk/build.xml

2013-11-25 Thread Mark Thomas
On 24/11/2013 22:07, kkoli...@apache.org wrote: > Author: kkolinko > Date: Sun Nov 24 22:07:08 2013 > New Revision: 1545084 > > URL: http://svn.apache.org/r1545084 > Log: > Exclude AprSocket class from instrumentation. > > Cobertura fails to instrument it, because it causes loading > jni.socket.

Re: XML parsing config clean-up

2013-11-25 Thread Mark Thomas
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 23/11/2013 04:14, Jeremy Boynes wrote: > On Nov 22, 2013, at 8:24 AM, Mark Thomas wrote: > >> Signed PGP part On 22/11/2013 16:18, Jeremy Boynes wrote: >>> On Nov 22, 2013, at 5:40 AM, Mark Thomas >>> wrote: >>> On 22/11/2013 13:04, Konstan