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

Author: markt Date: Tue Feb 4 09:19:03 2014 New Revision: 1564233 URL: http://svn.apache.org/r1564233 Log: Keep up with DBCP2 Modified: tomcat/trunk/build.properties.default Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.defa

[Bug 56104] New: Provide new Icon for tomcat 8 and change installation welcome image

https://issues.apache.org/bugzilla/show_bug.cgi?id=56104 Bug ID: 56104 Summary: Provide new Icon for tomcat 8 and change installation welcome image Product: Tomcat 8 Version: trunk Hardware: PC Status: NEW

svn commit: r1564246 - in /tomcat/trunk: res/side_left.bmp webapps/docs/changelog.xml

Author: markt Date: Tue Feb 4 10:28:48 2014 New Revision: 1564246 URL: http://svn.apache.org/r1564246 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56104 Correct the version number for the installer Modified: tomcat/trunk/res/side_left.bmp tomcat/trunk/webapps/docs/changelo

[Bug 56104] Provide new Icon for tomcat 8 and change installation welcome image

https://issues.apache.org/bugzilla/show_bug.cgi?id=56104 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|---

JDK 8 Build 128 is available on java.net

Hi Mladen, JDK 8 Build b128 Early Access Build is now available for download & test. Please log all show stopper issues as soon as possible. I would encourage you to read another interesting blog by Eric Costlow regarding JDK 8 using TLS 1.2 as default <

[jira] [Commented] (MTOMCAT-255) Getting "Target Unreachable, identifier 'pessoaBean' resolved to null" on tomcat:run but not in tomcat:run-war

[ https://issues.apache.org/jira/browse/MTOMCAT-255?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13890603#comment-13890603 ] Tamal Kanti Nath commented on MTOMCAT-255: -- Hi, I am also getting the same probl

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

Author: kkolinko Date: Tue Feb 4 13:19:27 2014 New Revision: 1564285 URL: http://svn.apache.org/r1564285 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=1564285&r1=1564284&r2

svn commit: r1564299 - /tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java

Author: violetagg Date: Tue Feb 4 13:50:53 2014 New Revision: 1564299 URL: http://svn.apache.org/r1564299 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56096 When creating JMXConnectorServer use the correct rmiBindAddress. Patch provided by Jim Talbut. Modified: tomcat/trunk/j

svn commit: r1564309 - in /tomcat/trunk/java/org/apache/catalina/tribes: io/XByteBuffer.java tipis/ReplicatedMap.java

Author: kkolinko Date: Tue Feb 4 14:16:22 2014 New Revision: 1564309 URL: http://svn.apache.org/r1564309 Log: Fix javadoc markup (reviewing r1561778, r1561773). Do not include unrelated text into the value of @version, @param. Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBu

svn commit: r1564312 - /tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java

Author: kkolinko Date: Tue Feb 4 14:21:21 2014 New Revision: 1564312 URL: http://svn.apache.org/r1564312 Log: Javadoc: fix typo and unclosed tag Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/Repl

svn commit: r1564317 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/tribes/io/XByteBuffer.java java/org/apache/catalina/tribes/tipis/ReplicatedMap.java

Author: kkolinko Date: Tue Feb 4 14:23:53 2014 New Revision: 1564317 URL: http://svn.apache.org/r1564317 Log: Merged revisions r1564309, r1564312 from tomcat/trunk: Fix javadoc markup (reviewing r1561778, r1561773). Do not include unrelated text into the value of @version, @param. Fix typo and un

svn commit: r1564320 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/tribes/io/XByteBuffer.java java/org/apache/catalina/tribes/tipis/ReplicatedMap.java

Author: kkolinko Date: Tue Feb 4 14:32:46 2014 New Revision: 1564320 URL: http://svn.apache.org/r1564320 Log: CTR: Javadoc fixes (reviewing r1561778, r1561773) Merged r1564317 from tomcat/tc7.0.x/trunk: Fix markup: do not include unrelated text into the value of @version, @param. Fix typo and un

svn commit: r1564323 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/

Author: kkolinko Date: Tue Feb 4 14:45:37 2014 New Revision: 1564323 URL: http://svn.apache.org/r1564323 Log: CTR: comments + discussed on dev list Remove $Id keyword and svn:keywords property from tomcat/util/digester/** Here '$Id$' was in the license header. Modified: tomcat/tc6.0.x/trun

svn commit: r1564325 - in /tomcat/tc6.0.x/trunk/java/org/apache/tomcat: jni/ util/buf/ util/http/ util/http/fileupload/ util/modeler/ util/net/ util/res/

Author: kkolinko Date: Tue Feb 4 14:53:22 2014 New Revision: 1564325 URL: http://svn.apache.org/r1564325 Log: CTR: comments + discussed on dev list Remove $Id, $Revision keywords from tomcat/** I am replacing @version with an empty line, to preserve line numbers. Modified: tomcat/tc6.0.x/tru

svn commit: r1564330 - in /tomcat/tc6.0.x/trunk/java/org/apache/tomcat: ./ buildutil/ jni/ util/ util/buf/ util/buf/res/ util/collections/ util/descriptor/ util/http/ util/http/fileupload/ util/http/m

Author: kkolinko Date: Tue Feb 4 15:00:34 2014 New Revision: 1564330 URL: http://svn.apache.org/r1564330 Log: CTR: comments + discussed on dev list Remove svn:keywords property from tomcat/** Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/Apr.java (props changed) tomcat/tc6.0.x/

svn commit: r1564334 - in /tomcat/tc6.0.x/trunk/java/org/apache/naming: ./ factory/ java/ resources/ resources/jndi/

Author: kkolinko Date: Tue Feb 4 15:12:41 2014 New Revision: 1564334 URL: http://svn.apache.org/r1564334 Log: CTR: comments + discussed on dev list Remove $Id, $Revision keywords from naming/** I am replacing @version with an empty line, to preserve line numbers. Modified: tomcat/tc6.0.x/tru

svn commit: r1564337 - in /tomcat/tc6.0.x/trunk/java/org/apache/naming: ./ factory/ factory/webservices/ java/ resources/ resources/jndi/

Author: kkolinko Date: Tue Feb 4 15:15:17 2014 New Revision: 1564337 URL: http://svn.apache.org/r1564337 Log: CTR: comments + discussed on dev list Remove svn:keywords property from naming/** Modified: tomcat/tc6.0.x/trunk/java/org/apache/naming/Constants.java (props changed) tomcat/tc

svn commit: r1564339 - in /tomcat/tc6.0.x/trunk/java/org/apache/juli: ./ logging/

Author: kkolinko Date: Tue Feb 4 15:16:56 2014 New Revision: 1564339 URL: http://svn.apache.org/r1564339 Log: CTR: comments + discussed on dev list Remove $Id keywords and svn:keywords property from juli/** I am replacing @version with an empty line, to preserve line numbers. Modified: tomca

svn commit: r1564343 - in /tomcat/tc6.0.x/trunk/java/org/apache/jasper: compiler/ resources/ runtime/ util/ xmlparser/

Author: kkolinko Date: Tue Feb 4 15:22:22 2014 New Revision: 1564343 URL: http://svn.apache.org/r1564343 Log: CTR: comments + discussed on dev list Remove $Id, $Revision keywords from jasper/** I am replacing @version with an empty line, to preserve line numbers. Modified: tomcat/tc6.0.x/tru

Help with updating the Maven Tomcat Plugin

Hi guys, I'm trying to work on https://issues.apache.org/jira/browse/MTOMCAT-234 Unfortunately the only thing that is left is this: the tomcat-maven-plugin uses ExternalRepositoriesReloadableWebappLoader to load additional repositories in the classloader. ExternalRepositoriesReloadableWebappLoa

svn commit: r1564344 - in /tomcat/tc6.0.x/trunk/java/org/apache/jasper: ./ compiler/ compiler/tagplugin/ el/ resources/ runtime/ security/ servlet/ tagplugins/jstl/ tagplugins/jstl/core/ util/ xmlpars

Author: kkolinko Date: Tue Feb 4 15:26:04 2014 New Revision: 1564344 URL: http://svn.apache.org/r1564344 Log: CTR: comments + discussed on dev list Remove svn:keywords property from jasper/** Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java (props changed) tomcat/tc

svn commit: r1564345 - in /tomcat/tc6.0.x/trunk/java/org/apache/el: ./ lang/ parser/ util/

Author: kkolinko Date: Tue Feb 4 15:29:20 2014 New Revision: 1564345 URL: http://svn.apache.org/r1564345 Log: CTR: comments + discussed on dev list Remove $Id keywords from el/** I am replacing @version with an empty line, to preserve line numbers. Modified: tomcat/tc6.0.x/trunk/java/org/apa

svn commit: r1564340 - in /tomcat/tc6.0.x/trunk/java/org/apache/jk: ./ apr/ common/ config/ core/ server/

Author: kkolinko Date: Tue Feb 4 15:19:57 2014 New Revision: 1564340 URL: http://svn.apache.org/r1564340 Log: CTR: comments + discussed on dev list Remove keywords and svn:keywords property from jk/** I am replacing @version with an empty line, to preserve line numbers. Modified: tomcat/tc6.

Re: Help with updating the Maven Tomcat Plugin

2014-02-04 Petar Tahchiev : > Hi guys, > > I'm trying to work on > > https://issues.apache.org/jira/browse/MTOMCAT-234 > > Unfortunately the only thing that is left is this: the tomcat-maven-plugin > uses > ExternalRepositoriesReloadableWebappLoader to load additional repositories > in the > classl

svn commit: r1564347 - in /tomcat/tc6.0.x/trunk/java/org/apache/el: ./ lang/ parser/ util/

Author: kkolinko Date: Tue Feb 4 15:37:26 2014 New Revision: 1564347 URL: http://svn.apache.org/r1564347 Log: CTR: comments + discussed on dev list Remove svn:keywords property from el/** Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/ExpressionFactoryImpl.java (props changed) tomc

svn commit: r1564349 - in /tomcat/tc6.0.x/trunk/java/org/apache/coyote: ajp/LocalStrings.properties http11/LocalStrings.properties http11/LocalStrings_es.properties http11/LocalStrings_fr.properties h

Author: kkolinko Date: Tue Feb 4 15:38:49 2014 New Revision: 1564349 URL: http://svn.apache.org/r1564349 Log: CTR: comments + discussed on dev list Remove $Id keywords from coyote/** Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings.properties tomcat/tc6.0.x/trunk/ja

svn commit: r1564350 - in /tomcat/tc6.0.x/trunk/java/org/apache/coyote: ./ ajp/ http11/ http11/filters/ memory/

Author: kkolinko Date: Tue Feb 4 15:40:35 2014 New Revision: 1564350 URL: http://svn.apache.org/r1564350 Log: CTR: comments + discussed on dev list Remove svn:keywords property from coyote/** Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ActionCode.java (props changed) tomcat/

svn commit: r1564353 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant: ./ jmx/

Author: kkolinko Date: Tue Feb 4 15:44:23 2014 New Revision: 1564353 URL: http://svn.apache.org/r1564353 Log: CTR: comments + discussed on dev list Remove $Id, $Revision keywords from catalina/ant/** I am replacing @version with an empty line, to preserve line numbers. Modified: tomcat/tc6.0

buildbot failure in ASF Buildbot on tomcat-trunk

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/5470 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source St

svn commit: r1564359 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha: ./ deploy/ session/ tcp/ util/

Author: kkolinko Date: Tue Feb 4 16:00:06 2014 New Revision: 1564359 URL: http://svn.apache.org/r1564359 Log: CTR: comments + discussed on dev list Remove $Id keywords from catalina/ha/** I am replacing @version with an empty line, to preserve line numbers. Modified: tomcat/tc6.0.x/trunk/jav

[jira] [Commented] (MTOMCAT-255) Getting "Target Unreachable, identifier 'pessoaBean' resolved to null" on tomcat:run but not in tomcat:run-war

[ https://issues.apache.org/jira/browse/MTOMCAT-255?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13890803#comment-13890803 ] Gilberto C Andrade commented on MTOMCAT-255: Hi, Tamal! That's the point of t

svn commit: r1564368 [2/2] - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina: loader/ manager/ manager/host/ mbeans/ realm/ security/ servlets/ session/ ssi/ startup/

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/UserDatabase.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/UserDatabase.java?rev=1564368&r1=1564367&r2=1564368&view=diff =

svn commit: r1564372 [2/2] - in /tomcat/tc6.0.x/trunk/java/org/apache: ./ catalina/ catalina/ant/ catalina/ant/jmx/ catalina/authenticator/ catalina/connector/ catalina/core/ catalina/deploy/ catalina

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java ('svn:keywords' removed) Propchange: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java ('svn:keywords' removed) Propchange: tomcat/tc6.0.x/trunk/jav

svn commit: r1564381 - in /tomcat/tc6.0.x/trunk: ./ java/javax/servlet/jsp/resources/ java/javax/servlet/resources/

Author: kkolinko Date: Tue Feb 4 17:13:10 2014 New Revision: 1564381 URL: http://svn.apache.org/r1564381 Log: Remove svn keywords and similar constructs for other source code management systems from schema and DTD files (backport of r1561706) Modified: tomcat/tc6.0.x/trunk/STATUS.txt tom

svn commit: r1564383 - in /tomcat/tc6.0.x/trunk/java/javax/servlet: ./ http/

Author: kkolinko Date: Tue Feb 4 17:18:09 2014 New Revision: 1564383 URL: http://svn.apache.org/r1564383 Log: CTR: comments + discussed on dev list Remove keywords from java/javax/** Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/GenericServlet.java tomcat/tc6.0.x/trunk/java/javax/ser

Re: support for salted passwords

Nick, On 2/2/14, 2:51 AM, Nick Williams wrote: > On Feb 2, 2014, at 1:23 AM, Gabriel E. Sánchez Martínez wrote: >> I am very new to Tomcat but am already getting my feet wet with a >> web application. A requirement for this application is form-based >> password authentication, and I would like to

svn commit: r1564392 - in /tomcat/tc6.0.x/trunk: java/javax/annotation/ java/javax/annotation/security/ java/javax/ejb/ java/javax/el/ java/javax/mail/ java/javax/mail/internet/ java/javax/persistence

Author: kkolinko Date: Tue Feb 4 17:30:20 2014 New Revision: 1564392 URL: http://svn.apache.org/r1564392 Log: CTR: comments + discussed on dev list Remove svn:keywords from the rest of files in Tomcat 6. Update changelog. Keywords removal in Tomcat 6 is done. Modified: tomcat/tc6.0.x/trunk/j

svn commit: r1564398 - /tomcat/trunk/java/org/apache/catalina/ha/ClusterDeployer.java

Author: kkolinko Date: Tue Feb 4 17:36:38 2014 New Revision: 1564398 URL: http://svn.apache.org/r1564398 Log: Move class Javadoc to the correct place Modified: tomcat/trunk/java/org/apache/catalina/ha/ClusterDeployer.java Modified: tomcat/trunk/java/org/apache/catalina/ha/ClusterDeployer.ja

svn commit: r1564399 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ha/ClusterDeployer.java

Author: kkolinko Date: Tue Feb 4 17:40:00 2014 New Revision: 1564399 URL: http://svn.apache.org/r1564399 Log: Merged r1564398 from tomcat/trunk: Move class Javadoc to the correct place Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/Clus

Re: Remove svn:keywords in Tomcat 6, 7, 8.

2014-01-27 Konstantin Kolinko : > 2014-01-25 Konstantin Kolinko : >> 2014/1/24 Konstantin Kolinko : >>> Hi! >>> >>> With so many people looking forward to Git [1] I think it is time to >>> remove svn keywords from our source files. >>> >>> There are two things: >>> 1) Remove $Id$ etc. lines from th

buildbot success in ASF Buildbot on tomcat-trunk

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/5471 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source

svn commit: r1564414 - /tomcat/trunk/webapps/docs/changelog.xml

Author: violetagg Date: Tue Feb 4 18:44:32 2014 New Revision: 1564414 URL: http://svn.apache.org/r1564414 Log: Update the changelog. Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/do

svn commit: r1564417 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java webapps/docs/changelog.xml

Author: violetagg Date: Tue Feb 4 18:53:45 2014 New Revision: 1564417 URL: http://svn.apache.org/r1564417 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56096 Merged revisions 1564299, 1564414 from tomcat/trunk: When creating JMXConnectorServer use the correct rmiBindAddress. Patch p

[Bug 56096] Setting rmiBindAddress on JmxRemoteLifecycleListener prevents tomcat from starting

https://issues.apache.org/bugzilla/show_bug.cgi?id=56096 Violeta Georgieva changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--

svn commit: r1564461 - in /tomcat/trunk: java/org/apache/tomcat/util/descriptor/web/ test/org/apache/catalina/startup/ test/webapp-fragments/WEB-INF/ webapps/docs/

Author: violetagg Date: Tue Feb 4 20:18:35 2014 New Revision: 1564461 URL: http://svn.apache.org/r1564461 Log: According to JavaEE specification (EE.5.4.1.3) when an env entry is specified in the web deployment descriptor and with annotation then the definition in the web deployment descriptor

Re: Re: support for salted passwords

On 02/04/2014 12:20 PM, Christopher Schultz wrote: Nick, On 2/2/14, 2:51 AM, Nick Williams wrote: On Feb 2, 2014, at 1:23 AM, Gabriel E. Sánchez Martínez wrote: I am very new to Tomcat but am already getting my feet wet with a web application. A requirement for this application is form-based

[Bug 55915] Add EECDH support to tcnative-1.dll

https://issues.apache.org/bugzilla/show_bug.cgi?id=55915 --- Comment #1 from Mike Noordermeer --- Created attachment 31283 --> https://issues.apache.org/bugzilla/attachment.cgi?id=31283&action=edit Add ECDHE support to Tomcat Native. It's not just the Windows binary, the source is also missing

[Bug 53762] JK status manager: mass nodes handling doesn't works

https://issues.apache.org/bugzilla/show_bug.cgi?id=53762 Brad changed: What|Removed |Added CC||mail-asf-bugzi...@so14k.com --- Comment #3

[Bug 56108] New: Allow user-defined Diffie-Hellman parameters

https://issues.apache.org/bugzilla/show_bug.cgi?id=56108 Bug ID: 56108 Summary: Allow user-defined Diffie-Hellman parameters Product: Tomcat Native Version: 1.1.29 Hardware: PC OS: All Status: NEW Severity

[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed

To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-validate has an issue affecting its community integration. Th

[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed

To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-validate has an issue affecting its community integration. Th

svn commit: r1564648 - /tomcat/trunk/webapps/docs/changelog.xml

Author: markt Date: Wed Feb 5 07:15:49 2014 New Revision: 1564648 URL: http://svn.apache.org/r1564648 Log: Whitespace police Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/chang

svn commit: r1564649 - /tomcat/trunk/webapps/docs/changelog.xml

Author: markt Date: Wed Feb 5 07:17:31 2014 New Revision: 1564649 URL: http://svn.apache.org/r1564649 Log: Keep a note of Commons DBCP updates Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/

svn commit: r1564651 - in /tomcat/trunk: build.properties.default webapps/docs/changelog.xml

Author: markt Date: Wed Feb 5 07:19:13 2014 New Revision: 1564651 URL: http://svn.apache.org/r1564651 Log: Pickup yesterdays DBCP changes Modified: tomcat/trunk/build.properties.default tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/build.properties.default URL: http://

svn commit: r1564656 - in /tomcat/jk/trunk/xdocs: ajp/project.xml generic_howto/project.xml index.xml miscellaneous/project.xml news/20140201.xml news/project.xml project.xml reference/project.xml web

Author: mturk Date: Wed Feb 5 07:51:43 2014 New Revision: 1564656 URL: http://svn.apache.org/r1564656 Log: Add year 2014 news document Added: tomcat/jk/trunk/xdocs/news/20140201.xml (with props) Modified: tomcat/jk/trunk/xdocs/ajp/project.xml tomcat/jk/trunk/xdocs/generic_howto/pro

svn commit: r1564660 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ test/org/apache/catalina/startup/ test/webapp-3.0-fragments/WEB-INF/ webapps/docs/

Author: violetagg Date: Wed Feb 5 07:58:38 2014 New Revision: 1564660 URL: http://svn.apache.org/r1564660 Log: Merged revision 1564461 from tomcat/trunk: According to JavaEE specification (EE.5.4.1.3) when an env entry is specified in the web deployment descriptor and with annotation then the de