[Bug 54217] JDBC connection pool runs out of connections when Context reload=“true” is enabled in Tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=54217 --- Comment #12 from Levan informatik0...@gmail.com --- (In reply to Mark Thomas from comment #11) There are two separate issues in this report and WONTFIX is not the correct status for either of them. The actual memory leak found while investigating this bug has been fixed in 7.0.34 onwards as per comments #4 to #6. The issue of the connections not being closed on reload is a result of the J2EE specification for JNDI resources and this part of the bug report is therefore invalid. I am restoring the state of this bug to fixed to reflect that the memory leak that did exist has been fixed. To expand on why the failure to immediately close connection after reload is invalid, the J2EE specification provides no mechanism for the container to tell the resource it is no longer required. Therefore all the container can do is clear references to the resource and wait for garbage collection (which will trigger the closure of the pool and the associated connections). Garbage collection occurs at times determined by the JVM so this is why it takes an indeterminate amount of time for connections to be closed after a context reload as a garbage collection may not occur for some time. Tomcat has added the Tomcat specific JNDI attribute closeMethod which can be used to trigger the explicit close of a JNDI resource when a context is stopped. If waiting for GC to clean up resources is not acceptable then simply use this parameter. Tomcat does not use this by default as it may have unexpected and unwanted side-effects for some JNDI resources. If you'd like to see a standard mechanism provided for telling JNDI resources that they are no longer required then you need to lobby the J2EE expert group. Thank you Mark for the explanation. I'll make a now third update to my Stack Overflow page and post this comment there. I knew it, it also had to do be about garbage collector. Again thanks! -- 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: r1557691 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: remm Date: Mon Jan 13 12:38:30 2014 New Revision: 1557691 URL: http://svn.apache.org/r1557691 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=1557691r1=1557690r2=1557691view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 13 12:38:30 2014 @@ -35,7 +35,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55759 Update the Eclipse compiler to 4.3.1 http://svn.apache.org/viewvc?view=revisionrevision=1539953 - +1: markt + +1: markt, remm +0: kkolinko: A Tomcat6-specific patch is needed. It needs update to jar exclude lists in TldConfig.java, TldLocationsCache.java, see r1476932. -1: @@ -64,7 +64,7 @@ PATCHES PROPOSED TO BACKPORT: * Back-port from XML processing improvements (part 5) Switch to a per context configuration for the XML digester http://people.apache.org/~markt/patches/2014-01-08-xml-prep-part5-tc6-v1.patch - +1: markt, kkolinko + +1: markt, kkolinko, remm -1: kkolinko: I see no need for the new non-static createWebXmlDigester(..) method to be public. It returns 'void', so it is unlikely for it to be @@ -81,7 +81,7 @@ PATCHES PROPOSED TO BACKPORT: code with the current Tomcat 7 code to validate the correctness of the back-port http://people.apache.org/~markt/patches/2014-01-08-xml-prep-part6-tc6-v1.patch - +1: markt, kkolinko + +1: markt, kkolinko, remm -1: kkolinko: It would be easier to review without all those trailing whitespace changes. @@ -90,7 +90,7 @@ PATCHES PROPOSED TO BACKPORT: Switch o.a.catalina classes to use the new ErrorHandler Back-port of http://svn.apache.org/r1547937 http://people.apache.org/~markt/patches/2014-01-08-xml-prep-part7-tc6-v1.patch - +1: markt, kkolinko + +1: markt, kkolinko, remm -1: * Back-port from XML processing improvements (part 8) @@ -99,7 +99,7 @@ PATCHES PROPOSED TO BACKPORT: http://people.apache.org/~markt/patches/2014-01-08-xml-prep-part8-tc6-v1.patch plus http://svn.apache.org/1556840 to address kkolinko's comment - +1: markt + +1: markt, remm +1: kkolinko (would be better with a fix to BZ 55974, so that the first error is reported like the old code does, not a random one) -1: @@ -108,7 +108,7 @@ PATCHES PROPOSED TO BACKPORT: Switch JspDocumentParser to an DefaultHandler2 Back-port of http://svn.apache.org/r1547948 http://people.apache.org/~markt/patches/2014-01-08-xml-prep-part9-tc6-v1.patch - +1: markt, kkolinko + +1: markt, kkolinko, remm -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55973 @@ -120,14 +120,14 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55119 Avoid CVE-2013-1571 when generating Javadoc http://svn.apache.org/r1495875 - +1: markt + +1: markt, remm +1: kkolinko (The fix goes into dist.xml) -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55671 Consistent naming for genStringAsCharArray https://issues.apache.org/bugzilla/attachment.cgi?id=31187 - +1: markt + +1: markt, remm -0: kkolinko: I think genStrAsCharArray is the proper and documented name for Tomcat 6. If we change the init-param name for better compatibility with Tomcat 7 (a good thing, +1), - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1557701 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/startup/ContextConfig.java
Author: markt
Date: Mon Jan 13 13:07:47 2014
New Revision: 1557701
URL: http://svn.apache.org/r1557701
Log:
Back-port from XML processing improvements (part 5)
Switch to a per context configuration for the XML digester
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1557701r1=1557700r2=1557701view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 13 13:07:47 2014
@@ -61,15 +61,6 @@ PATCHES PROPOSED TO BACKPORT:
requires Ant = 1.8.0).
-1:
-* Back-port from XML processing improvements (part 5)
- Switch to a per context configuration for the XML digester
-
http://people.apache.org/~markt/patches/2014-01-08-xml-prep-part5-tc6-v1.patch
- +1: markt, kkolinko, remm
- -1:
- kkolinko: I see no need for the new non-static createWebXmlDigester(..)
- method to be public. It returns 'void', so it is unlikely for it to be
- called from outside.
-
* Back-port from XML processing improvements (part 6)
Upgrade digester to use DefaultHandler2 and use LexicalHandler to detect
publicId.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1557701r1=1557700r2=1557701view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Mon Jan 13 13:07:47 2014
@@ -63,7 +63,7 @@ import org.xml.sax.SAXParseException;
*
* @author Craig R. McClanahan
* @author Jean-Francois Arcand
- * @version $Id:$
+ * @version $Id$
*/
public class ContextConfig implements LifecycleListener {
@@ -147,23 +147,22 @@ public class ContextConfig implements Li
* The codeDigester/code we will use to process web application
* deployment descriptor files.
*/
-protected static Digester webDigester = null;
-
-
-/**
- * The codeRule/code used to parse the web.xml
- */
-protected static WebRuleSet webRuleSet = new WebRuleSet();
+protected Digester webDigester = null;
+protected WebRuleSet webRuleSet = null;
/**
* Attribute value used to turn on/off XML validation
+ * @deprecated Unused. Will be removed in Tomcat 7.0.x.
*/
- protected static boolean xmlValidation = false;
+@Deprecated
+protected static boolean xmlValidation = false;
/**
* Attribute value used to turn on/off XML namespace awarenes.
+ * @deprecated Unused. Will be removed in Tomcat 7.0.x.
*/
+@Deprecated
protected static boolean xmlNamespaceAware = false;
@@ -508,27 +507,16 @@ public class ContextConfig implements Li
/**
- * Create (if necessary) and return a Digester configured to process the
+ * Create and return a Digester configured to process the
* web application deployment descriptor (web.xml).
*/
-protected static Digester createWebDigester() {
-Digester webDigester =
-createWebXmlDigester(xmlNamespaceAware, xmlValidation);
-return webDigester;
-}
-
+protected void createWebXmlDigester(boolean namespaceAware,
+boolean validation) {
-/**
- * Create (if necessary) and return a Digester configured to process the
- * web application deployment descriptor (web.xml).
- */
-public static Digester createWebXmlDigester(boolean namespaceAware,
-boolean validation) {
-
-Digester webDigester = DigesterFactory.newDigester(xmlValidation,
-xmlNamespaceAware,
-webRuleSet);
-return webDigester;
+webRuleSet = new WebRuleSet();
+webDigester = DigesterFactory.newDigester(validation,
+namespaceAware, webRuleSet);
+webDigester.getParser();
}
@@ -991,11 +979,6 @@ public class ContextConfig implements Li
protected void init() {
// Called from StandardContext.init()
-if (webDigester == null){
-webDigester = createWebDigester();
-webDigester.getParser();
-}
-
if (contextDigester == null){
contextDigester = createContextDigester();
contextDigester.getParser();
@@ -1015,6 +998,8 @@ public class ContextConfig implements Li
contextConfig.fixDocBase, context.getPath()), e);
}
+createWebXmlDigester(context.getXmlNamespaceAware(),
+
svn commit: r1557710 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/core/StandardContext.java java/org/apache/tomcat/util/digester/Digester.java
Author: markt
Date: Mon Jan 13 13:38:05 2014
New Revision: 1557710
URL: http://svn.apache.org/r1557710
Log:
Back-port from XML processing improvements (part 6)
Upgrade digester to use DefaultHandler2 and use LexicalHandler to detect
publicId.
Simplify web application version detection in web.xml
Extracted from a patch by Jeremy Boynes.
Essentially, this is a back-port of http://svn.apache.org/r1547931
Note that the patch contains a number of strictly unnecessary cosmetic changes
that have been included to make it simpler to compare the resulting Tomcat 6
code with the current Tomcat 7 code to validate the correctness of the back-port
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1557710r1=1557709r2=1557710view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 13 13:38:05 2014
@@ -61,22 +61,6 @@ PATCHES PROPOSED TO BACKPORT:
requires Ant = 1.8.0).
-1:
-* Back-port from XML processing improvements (part 6)
- Upgrade digester to use DefaultHandler2 and use LexicalHandler to detect
- publicId.
- Simplify web application version detection in web.xml
- Extracted from a patch by Jeremy Boynes.
- Essentially, this is a back-port of http://svn.apache.org/r1547931
- Note that the patch contains a number of strictly unnecessary cosmetic
changes
- that have been included to make it simpler to compare the resulting Tomcat 6
- code with the current Tomcat 7 code to validate the correctness of the
- back-port
-
http://people.apache.org/~markt/patches/2014-01-08-xml-prep-part6-tc6-v1.patch
- +1: markt, kkolinko, remm
- -1:
- kkolinko: It would be easier to review without all those trailing
- whitespace changes.
-
* Back-port from XML processing improvements (part 7)
Switch o.a.catalina classes to use the new ErrorHandler
Back-port of http://svn.apache.org/r1547937
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1557710r1=1557709r2=1557710view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Mon
Jan 13 13:38:05 2014
@@ -101,6 +101,7 @@ import org.apache.naming.resources.DirCo
import org.apache.naming.resources.FileDirContext;
import org.apache.naming.resources.ProxyDirContext;
import org.apache.naming.resources.WARDirContext;
+import org.apache.tomcat.util.descriptor.XmlIdentifiers;
import org.apache.tomcat.util.modeler.Registry;
/**
@@ -5049,15 +5050,7 @@ public class StandardContext
* Are we processing a version 2.2 deployment descriptor?
*/
protected boolean isServlet22() {
-
-if (this.publicId == null)
-return (false);
-if (this.publicId.equals
-(org.apache.catalina.startup.Constants.WebDtdPublicId_22))
-return (true);
-else
-return (false);
-
+return XmlIdentifiers.WEB_22_PUBLIC.equals(publicId);
}
@@ -5888,7 +5881,7 @@ public class StandardContext
public void setTldNamespaceAware(boolean tldNamespaceAware){
// NO-OP;
-}
+}
public void setTldValidation(boolean tldValidation){
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1557710r1=1557709r2=1557710view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java Mon
Jan 13 13:38:05 2014
@@ -5,15 +5,15 @@
* 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.tomcat.util.digester;
@@ -24,6 +24,8 @@ import java.io.IOException;
import java.io.InputStream;
svn commit: r1557711 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/startup/ContextConfig.java java/org/apache/catalina/startup/TldConfig.java
Author: markt
Date: Mon Jan 13 13:40:48 2014
New Revision: 1557711
URL: http://svn.apache.org/r1557711
Log:
Back-port from XML processing improvements (part 7)
Switch o.a.catalina classes to use the new ErrorHandler
Back-port of http://svn.apache.org/r1547937
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1557711r1=1557710r2=1557711view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 13 13:40:48 2014
@@ -61,13 +61,6 @@ PATCHES PROPOSED TO BACKPORT:
requires Ant = 1.8.0).
-1:
-* Back-port from XML processing improvements (part 7)
- Switch o.a.catalina classes to use the new ErrorHandler
- Back-port of http://svn.apache.org/r1547937
-
http://people.apache.org/~markt/patches/2014-01-08-xml-prep-part7-tc6-v1.patch
- +1: markt, kkolinko, remm
- -1:
-
* Back-port from XML processing improvements (part 8)
Switch ParserUtils to use the new ErrorHandler
Back-port of http://svn.apache.org/r1547947
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1557711r1=1557710r2=1557711view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Mon Jan 13 13:40:48 2014
@@ -51,6 +51,7 @@ import org.apache.catalina.deploy.Securi
import org.apache.catalina.util.StringManager;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.descriptor.XmlErrorHandler;
import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.digester.RuleSet;
import org.xml.sax.ErrorHandler;
@@ -119,7 +120,9 @@ public class ContextConfig implements Li
/**
* Any parse error which occurred while parsing XML descriptors.
+ * @deprecated Unused. Will be removed in Tomcat 7.0.x.
*/
+@Deprecated
protected SAXParseException parseException = null;
@@ -348,8 +351,11 @@ public class ContextConfig implements Li
if (context instanceof StandardContext) {
((StandardContext)
context).setReplaceWelcomeFiles(true);
}
+
+XmlErrorHandler handler = new XmlErrorHandler();
+
webDigester.push(context);
-webDigester.setErrorHandler(new ContextErrorHandler());
+webDigester.setErrorHandler(handler);
if(log.isDebugEnabled()) {
log.debug(Parsing application web.xml file at +
url.toExternalForm());
@@ -357,8 +363,10 @@ public class ContextConfig implements Li
webDigester.parse(is);
-if (parseException != null) {
+if (handler.getWarnings().size() 0 ||
+handler.getErrors().size() 0) {
ok = false;
+handler.logFindings(log, is.getSystemId());
}
} else {
log.info(No web.xml, using defaults + context );
@@ -374,7 +382,6 @@ public class ContextConfig implements Li
ok = false;
} finally {
webDigester.reset();
-parseException = null;
try {
if (stream != null) {
stream.close();
@@ -664,11 +671,14 @@ public class ContextConfig implements Li
((StandardContext) context).setReplaceWelcomeFiles(true);
digester.setClassLoader(this.getClass().getClassLoader());
digester.setUseContextClassLoader(false);
+XmlErrorHandler handler = new XmlErrorHandler();
digester.push(context);
-digester.setErrorHandler(new ContextErrorHandler());
+digester.setErrorHandler(handler);
digester.parse(source);
-if (parseException != null) {
+if (handler.getWarnings().size() 0 ||
+handler.getErrors().size() 0) {
ok = false;
+handler.logFindings(log, source.getSystemId());
}
} catch (SAXParseException e) {
log.error(sm.getString(contextConfig.defaultParse), e);
@@ -681,7 +691,6 @@ public class ContextConfig implements Li
ok = false;
} finally
svn commit: r1557714 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/xmlparser/ParserUtils.java java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java
Author: markt
Date: Mon Jan 13 13:46:33 2014
New Revision: 1557714
URL: http://svn.apache.org/r1557714
Log:
Back-port from XML processing improvements (part 8)
Switch ParserUtils to use the new ErrorHandler
Back-port of http://svn.apache.org/r1547947 and http://svn.apache.org/r1556840
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1557714r1=1557713r2=1557714view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 13 13:46:33 2014
@@ -61,17 +61,6 @@ PATCHES PROPOSED TO BACKPORT:
requires Ant = 1.8.0).
-1:
-* Back-port from XML processing improvements (part 8)
- Switch ParserUtils to use the new ErrorHandler
- Back-port of http://svn.apache.org/r1547947
-
http://people.apache.org/~markt/patches/2014-01-08-xml-prep-part8-tc6-v1.patch
- plus
- http://svn.apache.org/1556840 to address kkolinko's comment
- +1: markt, remm
- +1: kkolinko (would be better with a fix to BZ 55974, so that the first
- error is reported like the old code does, not a random one)
- -1:
-
* Back-port from XML processing improvements (part 9)
Switch JspDocumentParser to an DefaultHandler2
Back-port of http://svn.apache.org/r1547948
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java?rev=1557714r1=1557713r2=1557714view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java Mon
Jan 13 13:46:33 2014
@@ -23,11 +23,11 @@ import javax.xml.parsers.DocumentBuilder
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
import org.apache.jasper.compiler.Localizer;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.descriptor.DigesterFactory;
+import org.apache.tomcat.util.descriptor.LocalResolver;
+import org.apache.tomcat.util.descriptor.XmlErrorHandler;
import org.w3c.dom.Comment;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
@@ -35,7 +35,6 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
@@ -52,14 +51,11 @@ import org.xml.sax.SAXParseException;
public class ParserUtils {
/**
- * An error handler for use when parsing XML documents.
- */
-static ErrorHandler errorHandler = new MyErrorHandler();
-
-/**
* An entity resolver for use when parsing XML documents.
*/
-static EntityResolver entityResolver = new MyEntityResolver();
+static EntityResolver entityResolver;
+
+private final EntityResolver entityResolverInstance;
/**
* @deprecated Unused. Will be removed in Tomcat 7.
@@ -81,9 +77,15 @@ public class ParserUtils {
public ParserUtils(boolean useValidation) {
this.useValidation = useValidation;
+if (entityResolver == null) {
+this.entityResolverInstance = new LocalResolver(
+DigesterFactory.SERVLET_API_PUBLIC_IDS,
+DigesterFactory.SERVLET_API_SYSTEM_IDS, false);
+} else {
+this.entityResolverInstance = entityResolver;
+}
}
-
// - Public Methods
/**
@@ -108,9 +110,14 @@ public class ParserUtils {
factory.setNamespaceAware(true);
factory.setValidating(useValidation);
DocumentBuilder builder = factory.newDocumentBuilder();
-builder.setEntityResolver(entityResolver);
-builder.setErrorHandler(errorHandler);
+builder.setEntityResolver(entityResolverInstance);
+XmlErrorHandler handler = new XmlErrorHandler();
+builder.setErrorHandler(handler);
document = builder.parse(is);
+if (!handler.getErrors().isEmpty()) {
+// throw the first to indicate there was a error during
processing
+throw handler.getErrors().iterator().next();
+}
} catch (ParserConfigurationException ex) {
throw new JasperException
(Localizer.getMessage(jsp.error.parse.xml, location), ex);
svn commit: r1557715 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/compiler/JspDocumentParser.java
Author: markt
Date: Mon Jan 13 13:49:31 2014
New Revision: 1557715
URL: http://svn.apache.org/r1557715
Log:
Back-port from XML processing improvements (part 9)
Switch JspDocumentParser to an DefaultHandler2
Back-port of http://svn.apache.org/r1547948
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1557715r1=1557714r2=1557715view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 13 13:49:31 2014
@@ -61,13 +61,6 @@ PATCHES PROPOSED TO BACKPORT:
requires Ant = 1.8.0).
-1:
-* Back-port from XML processing improvements (part 9)
- Switch JspDocumentParser to an DefaultHandler2
- Back-port of http://svn.apache.org/r1547948
-
http://people.apache.org/~markt/patches/2014-01-08-xml-prep-part9-tc6-v1.patch
- +1: markt, kkolinko, remm
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55973
Fix processing of XML schemas when validation is enabled in Jasper
http://svn.apache.org/r1556377
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java?rev=1557715r1=1557714r2=1557715view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
Mon Jan 13 13:49:31 2014
@@ -5,9 +5,9 @@
* 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.
@@ -39,9 +39,8 @@ import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
-import org.xml.sax.ext.LexicalHandler;
+import org.xml.sax.ext.DefaultHandler2;
import org.xml.sax.helpers.AttributesImpl;
-import org.xml.sax.helpers.DefaultHandler;
/**
* Class implementing a parser for a JSP document, that is, a JSP page in XML
@@ -52,8 +51,8 @@ import org.xml.sax.helpers.DefaultHandle
*/
class JspDocumentParser
-extends DefaultHandler
-implements LexicalHandler, TagConstants {
+extends DefaultHandler2
+implements TagConstants {
private static final String JSP_VERSION = version;
private static final String LEXICAL_HANDLER_PROPERTY =
@@ -73,7 +72,7 @@ class JspDocumentParser
* Outermost (in the nesting hierarchy) node whose body is declared to be
* scriptless. If a node's body is declared to be scriptless, all its
* nested nodes must be scriptless, too.
- */
+ */
private Node scriptlessBodyNode;
private Locator locator;
@@ -240,11 +239,19 @@ class JspDocumentParser
}
}
+
+@Override
+public InputSource resolveEntity(String name, String publicId, String
baseURI, String systemId)
+throws SAXException, IOException {
+return null;
+}
+
+
/*
* Receives notification of the start of an element.
*
* This method assigns the given tag attributes to one of 3 buckets:
- *
+ *
* - xmlns attributes that represent (standard or custom) tag libraries.
* - xmlns attributes that do not represent tag libraries.
* - all remaining attributes.
@@ -274,7 +281,7 @@ class JspDocumentParser
}
String currentPrefix = getPrefix(current.getQName());
-
+
// jsp:text must not have any subelements
if (JSP_URI.equals(uri) TEXT_ACTION.equals(current.getLocalName())
jsp.equals(currentPrefix)) {
@@ -289,7 +296,7 @@ class JspDocumentParser
if (attrs != null) {
/*
* Notice that due to a bug in the underlying SAX parser, the
- * attributes must be enumerated in descending order.
+ * attributes must be enumerated in descending order.
*/
boolean isTaglib = false;
for (int i = attrs.getLength() - 1; i = 0; i--) {
@@ -441,7 +448,7 @@ class JspDocumentParser
* invoke this method with chunks of it. This is a problem when we try
* to determine if the text contains only whitespaces, or when we are
* looking for an EL expression string. Therefore it is necessary to
- * buffer and concatenate the chunks
[Bug 55973] Failure to parse MergedWebXml when validation is enabled in Jasper
https://issues.apache.org/bugzilla/show_bug.cgi?id=55973 --- Comment #3 from Mark Thomas ma...@apache.org --- The fix has been applied to 6.0.x for 6.0.38 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: r1557719 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/xmlparser/ParserUtils.java webapps/docs/changelog.xml
Author: markt
Date: Mon Jan 13 13:59:12 2014
New Revision: 1557719
URL: http://svn.apache.org/r1557719
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55973
Fix processing of XML schemas when validation is enabled in Jasper
Back-port of http://svn.apache.org/r1556377
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1557719r1=1557718r2=1557719view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 13 13:59:12 2014
@@ -61,12 +61,6 @@ PATCHES PROPOSED TO BACKPORT:
requires Ant = 1.8.0).
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55973
- Fix processing of XML schemas when validation is enabled in Jasper
- http://svn.apache.org/r1556377
- +1: kkolinko, jboynes, markt
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55119
Avoid CVE-2013-1571 when generating Javadoc
http://svn.apache.org/r1495875
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java?rev=1557719r1=1557718r2=1557719view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java Mon
Jan 13 13:59:12 2014
@@ -109,6 +109,16 @@ public class ParserUtils {
DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true);
factory.setValidating(useValidation);
+if (useValidation) {
+// Enable DTD validation
+factory.setFeature(
+http://xml.org/sax/features/validation;,
+true);
+// Enable schema validation
+factory.setFeature(
+http://apache.org/xml/features/validation/schema;,
+true);
+}
DocumentBuilder builder = factory.newDocumentBuilder();
builder.setEntityResolver(entityResolverInstance);
XmlErrorHandler handler = new XmlErrorHandler();
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1557719r1=1557718r2=1557719view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jan 13 13:59:12 2014
@@ -148,6 +148,10 @@
bug55691/bug: Fix codejavax.el.ArrayELResolver/code to
correctly
handle the case where the base object is an array of primitives.
(markt)
/fix
+ fix
+bug55973/bug: Fix processing of XML schemas when validation is
+enabled in Jasper. (kkolinko)
+ /fix
/changelog
/subsection
subsection name=Web applications
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55119] Change Javadoc generation per CVE-2013-1571, VU#225657
https://issues.apache.org/bugzilla/show_bug.cgi?id=55119 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Mark Thomas ma...@apache.org --- Fixed in 6.0.x for 6.0.38 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: r1557724 - in /tomcat/tc6.0.x/trunk: STATUS.txt dist.xml webapps/docs/changelog.xml
Author: markt
Date: Mon Jan 13 14:15:18 2014
New Revision: 1557724
URL: http://svn.apache.org/r1557724
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55119
Avoid CVE-2013-1571 when generating Javadoc
Back-port of http://svn.apache.org/r1495875
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1557724r1=1557723r2=1557724view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 13 14:15:18 2014
@@ -61,13 +61,6 @@ PATCHES PROPOSED TO BACKPORT:
requires Ant = 1.8.0).
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55119
- Avoid CVE-2013-1571 when generating Javadoc
- http://svn.apache.org/r1495875
- +1: markt, remm
- +1: kkolinko (The fix goes into dist.xml)
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55671
Consistent naming for genStringAsCharArray
https://issues.apache.org/bugzilla/attachment.cgi?id=31187
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=1557724r1=1557723r2=1557724view=diff
==
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Mon Jan 13 14:15:18 2014
@@ -237,8 +237,78 @@
additionalparam=-breakiterator
maxmemory=256m
/javadoc
+patch-javadoc dir=${tomcat.dist}/webapps/docs/api
+ docencoding=ISO-8859-1/
/target
+ !--
+Patch frame injection bugs in javadoc generated files - see CVE-2013-1571,
+http://www.kb.cert.org/vuls/id/225657
+
+This macro works together with the javadoc task on Ant and should be
invoked
+directly after its execution to patch broken javadocs, e.g.:
+patch-javadoc dir=... docencoding=UTF-8/
+Please make sure that the docencoding parameter uses the same charset as
+javadoc's docencoding. Default is the platform default encoding (like the
+javadoc task).
+The specified dir is the destination directory of the javadoc task.
+ --
+ macrodef name=patch-javadoc
+attribute name=dir/
+attribute name=docencoding default=${file.encoding}/
+sequential
+ replace encoding=@{docencoding} summary=true
taskname=patch-javadoc
+restrict
+ fileset dir=@{dir} casesensitive=false
+ includes=**/index.html,**/index.htm,**/toc.html,**/toc.htm/
+ !-- TODO: add encoding=@{docencoding} to contains check, when we
+ are on ANT 1.9.0: --
+ not
+contains text=function validURL(url) { casesensitive=true /
+ /not
+/restrict
+replacetoken![CDATA[function loadFrames() {]]/replacetoken
+replacevalue expandProperties=false![CDATA[if (targetPage !=
!validURL(targetPage))
+targetPage = undefined;
+function validURL(url) {
+var pos = url.indexOf(.html);
+if (pos == -1 || pos != url.length - 5)
+return false;
+var allowNumber = false;
+var allowSep = false;
+var seenDot = false;
+for (var i = 0; i url.length - 5; i++) {
+var ch = url.charAt(i);
+if ('a' = ch ch = 'z' ||
+'A' = ch ch = 'Z' ||
+ch == '$' ||
+ch == '_') {
+allowNumber = true;
+allowSep = true;
+} else if ('0' = ch ch = '9'
+|| ch == '-') {
+if (!allowNumber)
+ return false;
+} else if (ch == '/' || ch == '.') {
+if (!allowSep)
+return false;
+allowNumber = false;
+allowSep = false;
+if (ch == '.')
+ seenDot = true;
+if (ch == '/' seenDot)
+ return false;
+} else {
+return false;
+}
+}
+return true;
+}
+function loadFrames() {]]/replacevalue
+ /replace
+/sequential
+ /macrodef
+
target name=dist-deployer description=Create the Tomcat deployer binary
!-- Servlet and JSP --
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1557724r1=1557723r2=1557724view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jan 13 14:15:18 2014
@@ -179,6 +179,9 @@
Fix the sample configuration of
codeStaticMembershipInterceptor/code
in order to prevent warning log. uniqueId must
svn commit: r1557727 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Jan 13 14:24:33 2014 New Revision: 1557727 URL: http://svn.apache.org/r1557727 Log: Propose an updated patch based on review comments 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=1557727r1=1557726r2=1557727view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 13 14:24:33 2014 @@ -34,10 +34,11 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55759 Update the Eclipse compiler to 4.3.1 - http://svn.apache.org/viewvc?view=revisionrevision=1539953 + http://people.apache.org/~markt/patches/2014-01-13-ecj-4.3.1-update-tc6-v1.patch +1: markt, remm +0: kkolinko: A Tomcat6-specific patch is needed. It needs update to jar exclude lists in TldConfig.java, TldLocationsCache.java, see r1476932. + markt: Patch updated -1: * Back-port some XML processing improvements (part 4) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56000] New: Tomcat should log xml validation errors by default.
https://issues.apache.org/bugzilla/show_bug.cgi?id=56000 Bug ID: 56000 Summary: Tomcat should log xml validation errors by default. Product: Tomcat 8 Version: 8.0.0-RC10 Hardware: All OS: All Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: juer...@jwi.de I had a typo in web.xml : serlet-name Tomcat does not show a meaningful error message (see below). I only saw the error by deploying on WLS, which throws: VALIDATION PROBLEMS WERE FOUND 16:6 problem: cvc-complex-type.2.4a: Expected element 'servlet-name@http://java.sun.com/xml/ns/javaee' instead of 'serlet-name@http://java.sun.com/xml/ns/javaee' Tomcat should also log xml validation errors by default. 13-Jan-2014 14:47:35.603 SEVERE [localhost-startStop-1] org.apache.catalina.core.ContainerBase.addChildInternal ContainerBase.addChild: start: org.apache.catalina.LifecycleException: Failed to initialize component [StandardEngine[Catalina].StandardHost[localhost].StandardContext[/hellod].StandardWrapper[null]] at org.apache.catalina.util.LifecycleBase.init(LifecycleBase.java:106) Caused by: java.lang.NullPointerException at org.apache.tomcat.util.modeler.Util.objectNameValueNeedsQuote(Util.java:26) -- 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: r1557728 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Jan 13 14:30:14 2014 New Revision: 1557728 URL: http://svn.apache.org/r1557728 Log: Proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1557728r1=1557727r2=1557728view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 13 14:30:14 2014 @@ -75,6 +75,15 @@ PATCHES PROPOSED TO BACKPORT: markt: patch updated -1: +* Add an option to the Context to control the blocking of XML external entities + when parsing XML configuration files and enable this blocking by default when + a security manager is used. The block is implemented via a custom resolver to + enable the logging of any blocked entities. + Backport of https://svn.apache.org/r1549529 + http://people.apache.org/~markt/patches/2014-01-13-xml-block-external-tc6-v1.patch + +1: markt + -1: + PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56000] Tomcat should log xml validation errors by default.
https://issues.apache.org/bugzilla/show_bug.cgi?id=56000 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #1 from Mark Thomas ma...@apache.org --- While XML validation is required by the Servlet specification, it is disabled by default for performance reasons. Neither of these facts is unlikely to change. You can enable validation on a per context basis using the required combination of tldValidation, xmlNamespaceAware and xmlValidation (see http://tomcat.apache.org/tomcat-8.0-doc/config/context.html#Common_Attributes) or you can start Tomcat with the org.apache.catalina.STRICT_SERVLET_COMPLIANCE system property set to true which configures various Tomcat options to follow the strict requirements of the servlet specification rather than then slightly relaxed default settings (which are that way for performance reasons). -- 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: Taglib Site Update
On Jan 12, 2014, at 10:56 PM, Henri Yandell flame...@gmail.com wrote: On Jan 11, 2014, at 10:58 PM, Henri Yandell flame...@gmail.com wrote: Remaining tasks: * Create a page to show source location. * Create a .cgi page for download mirrors *I hope that's gotten easier* * Change urls to point to mirror rather than archive * Push content into tomcat-site/taglibs manually * Change the news item on Tomcat itself to announce the release *http://tomcat.apache.org/download-taglibs.cgi http://tomcat.apache.org/download-taglibs.cgi* now exists. Jeremy - could you upload your public sig to a KEYS file at: https://www.apache.org/dist/tomcat/taglibs/KEYS It seems there's a trunk/KEYS for all Tomcat RMs, but also specific KEYS files per downloaded product. I'm not sure of the right way to put files in dist.apache.org nowadays, but I figure you would have hit it during release :) I don’t think I can - access to the release tree is limited to PMC members. I have added my key here: https://svn.apache.org/repos/asf/tomcat/trunk/KEYS if someone can copy it. Thanks Jeremy signature.asc Description: Message signed with OpenPGP using GPGMail
svn commit: r1557747 - /tomcat/trunk/bin/catalina.sh
Author: markt Date: Mon Jan 13 15:20:59 2014 New Revision: 1557747 URL: http://svn.apache.org/r1557747 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55743 Enable the stop script to work when the shutdown port is disabled and a PID file is defined. Modified: tomcat/trunk/bin/catalina.sh Modified: tomcat/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1557747r1=1557746r2=1557747view=diff == --- tomcat/trunk/bin/catalina.sh (original) +++ tomcat/trunk/bin/catalina.sh Mon Jan 13 15:20:59 2014 @@ -412,6 +412,8 @@ elif [ $1 = start ] ; then echo $! $CATALINA_PID fi + echo Tomcat started. + elif [ $1 = stop ] ; then shift @@ -455,6 +457,14 @@ elif [ $1 = stop ] ; then -Djava.io.tmpdir=\$CATALINA_TMPDIR\ \ org.apache.catalina.startup.Bootstrap $@ stop + # stop failed. Shutdown port disabled? Try a normal kill. + if [ $? != 0 ]; then +if [ ! -z $CATALINA_PID ]; then + echo The stop command failed. Attempting to signal the process to stop through OS signal. + kill -15 `cat $CATALINA_PID` /dev/null 21 +fi + fi + if [ ! -z $CATALINA_PID ]; then if [ -f $CATALINA_PID ]; then while [ $SLEEP -ge 0 ]; do @@ -467,9 +477,10 @@ elif [ $1 = stop ] ; then # If Tomcat has stopped don't try and force a stop with an empty PID file FORCE=0 else - echo Tomcat stopped but the PID file could not be removed or cleared. + echo The PID file could not be removed or cleared. fi fi + echo Tomcat stopped. break fi if [ $SLEEP -gt 0 ]; then - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55743] Shutdown script broken on linux when only using PID-File
https://issues.apache.org/bugzilla/show_bug.cgi?id=55743 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #6 from Mark Thomas ma...@apache.org --- This has been fixed in 8.0.x for 8.0.0 onwards and in 7.0.x for 7.0.51 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: r1557751 - in /tomcat/tc7.0.x/trunk: ./ bin/catalina.sh webapps/docs/changelog.xml
Author: markt Date: Mon Jan 13 15:28:31 2014 New Revision: 1557751 URL: http://svn.apache.org/r1557751 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55743 Enable the stop script to work when the shutdown port is disabled and a PID file is defined. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/bin/catalina.sh tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1557747 Modified: tomcat/tc7.0.x/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/catalina.sh?rev=1557751r1=1557750r2=1557751view=diff == --- tomcat/tc7.0.x/trunk/bin/catalina.sh (original) +++ tomcat/tc7.0.x/trunk/bin/catalina.sh Mon Jan 13 15:28:31 2014 @@ -398,6 +398,8 @@ elif [ $1 = start ] ; then echo $! $CATALINA_PID fi + echo Tomcat started. + elif [ $1 = stop ] ; then shift @@ -441,6 +443,14 @@ elif [ $1 = stop ] ; then -Djava.io.tmpdir=\$CATALINA_TMPDIR\ \ org.apache.catalina.startup.Bootstrap $@ stop + # stop failed. Shutdown port disabled? Try a normal kill. + if [ $? != 0 ]; then +if [ ! -z $CATALINA_PID ]; then + echo The stop command failed. Attempting to signal the process to stop through OS signal. + kill -15 `cat $CATALINA_PID` /dev/null 21 +fi + fi + if [ ! -z $CATALINA_PID ]; then if [ -f $CATALINA_PID ]; then while [ $SLEEP -ge 0 ]; do @@ -453,9 +463,10 @@ elif [ $1 = stop ] ; then # If Tomcat has stopped don't try and force a stop with an empty PID file FORCE=0 else - echo Tomcat stopped but the PID file could not be removed or cleared. + echo The PID file could not be removed or cleared. fi fi + echo Tomcat stopped. break fi if [ $SLEEP -gt 0 ]; then 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=1557751r1=1557750r2=1557751view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jan 13 15:28:31 2014 @@ -126,6 +126,15 @@ /fix /changelog /subsection + subsection name=Other +changelog + fix +bug55743/bug: Enable the stop script to work when the shutdown port +is disabled and a PID file is defined. This is only available on +platforms that use codecatalina.sh/code. (markt) + /fix +/changelog + /subsection /section section name=Tomcat 7.0.50 (violetagg) rtext=2014-01-08 subsection name=Catalina - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception 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/5393 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1557747 Blamelist: markt BUILD FAILED: exception compile upload_2 sincerely, -The Buildbot
svn commit: r1557752 - /tomcat/trunk/bin/catalina.sh
Author: markt Date: Mon Jan 13 15:39:47 2014 New Revision: 1557752 URL: http://svn.apache.org/r1557752 Log: https://issues.apache.org/bugzilla/show_bug.cgi?id=55986 Ensure that if Tomcat is stopped via kill -9 PID that the script doesn't falsely report that it is still running. Based on a patch by jess. Modified: tomcat/trunk/bin/catalina.sh Modified: tomcat/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1557752r1=1557751r2=1557752view=diff == --- tomcat/trunk/bin/catalina.sh (original) +++ tomcat/trunk/bin/catalina.sh Mon Jan 13 15:39:47 2014 @@ -514,11 +514,12 @@ elif [ $1 = stop ] ; then if [ -w $CATALINA_PID ]; then cat /dev/null $CATALINA_PID else -echo Tomcat was killed but the PID file could not be removed. +echo The PID file could not be removed. fi -# Set this to zero else a warning will be issued about the process still running -KILL_SLEEP_INTERVAL=0 fi +# Set this to zero else a warning will be issued about the process still running +KILL_SLEEP_INTERVAL=0 +echo The Tomcat process has been killed. break fi if [ $KILL_SLEEP_INTERVAL -gt 0 ]; then - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1557753 - in /tomcat/tc7.0.x/trunk: ./ bin/catalina.sh webapps/docs/changelog.xml
Author: markt Date: Mon Jan 13 15:42:53 2014 New Revision: 1557753 URL: http://svn.apache.org/r1557753 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55986 When forcing Tomcat to stop via kill -9 $CATALINA_PID, the codecatalina.sh/code script could incorrectly report that Tomcat had not yet completely stopped when it had. Based on a patch by jess. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/bin/catalina.sh tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1557752 Modified: tomcat/tc7.0.x/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/catalina.sh?rev=1557753r1=1557752r2=1557753view=diff == --- tomcat/tc7.0.x/trunk/bin/catalina.sh (original) +++ tomcat/tc7.0.x/trunk/bin/catalina.sh Mon Jan 13 15:42:53 2014 @@ -500,11 +500,12 @@ elif [ $1 = stop ] ; then if [ -w $CATALINA_PID ]; then cat /dev/null $CATALINA_PID else -echo Tomcat was killed but the PID file could not be removed. +echo The PID file could not be removed. fi -# Set this to zero else a warning will be issued about the process still running -KILL_SLEEP_INTERVAL=0 fi +# Set this to zero else a warning will be issued about the process still running +KILL_SLEEP_INTERVAL=0 +echo The Tomcat process has been killed. break fi if [ $KILL_SLEEP_INTERVAL -gt 0 ]; then 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=1557753r1=1557752r2=1557753view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jan 13 15:42:53 2014 @@ -133,6 +133,12 @@ is disabled and a PID file is defined. This is only available on platforms that use codecatalina.sh/code. (markt) /fix + fix +bug55986/bug: When forcing Tomcat to stop via +codekill -9 $CATALINA_PID/code, the codecatalina.sh/code script +could incorrectly report that Tomcat had not yet completely stopped when +it had. Based on a patch by jess. (markt) + /fix /changelog /subsection /section - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55986] catalina.sh -force may falsely report Tomcat has not been killed completely yet
https://issues.apache.org/bugzilla/show_bug.cgi?id=55986 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas ma...@apache.org --- Thanks for the report and the patch. I have applied the patch (with some additional tweaks) to 8.0.x for 8.0.0 onwards and to 7.0.x for 7.0.51 onwards. Your contribution has been recognized in both the commit log and the changelog. Thanks again. -- 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: r1557755 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: mturk Date: Mon Jan 13 15:46:36 2014 New Revision: 1557755 URL: http://svn.apache.org/r1557755 Log: Cast my votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1557755r1=1557754r2=1557755view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 13 15:46:36 2014 @@ -35,7 +35,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55759 Update the Eclipse compiler to 4.3.1 http://people.apache.org/~markt/patches/2014-01-13-ecj-4.3.1-update-tc6-v1.patch - +1: markt, remm + +1: markt, remm, mturk +0: kkolinko: A Tomcat6-specific patch is needed. It needs update to jar exclude lists in TldConfig.java, TldLocationsCache.java, see r1476932. markt: Patch updated @@ -49,7 +49,7 @@ PATCHES PROPOSED TO BACKPORT: Note: Part 5 onwards do not depend on this patch so this could be ignored / addressed later without impacting the XML changes. http://people.apache.org/~markt/patches/2013-12-19-xml-prep-part4-tc6-v1.patch - +1: markt, remm + +1: markt, remm, mturk +0: kkolinko: This requires JUnit4. Formally, eclipse.classpath file still uses JUnit 3 and if I understand correctly build.xml does not have JUnit @@ -65,7 +65,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55671 Consistent naming for genStringAsCharArray https://issues.apache.org/bugzilla/attachment.cgi?id=31187 - +1: markt, remm + +1: markt, remm, mturk -0: kkolinko: I think genStrAsCharArray is the proper and documented name for Tomcat 6. If we change the init-param name for better compatibility with Tomcat 7 (a good thing, +1), @@ -81,7 +81,7 @@ PATCHES PROPOSED TO BACKPORT: enable the logging of any blocked entities. Backport of https://svn.apache.org/r1549529 http://people.apache.org/~markt/patches/2014-01-13-xml-block-external-tc6-v1.patch - +1: markt + +1: markt, mturk -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1557766 - /tomcat/trunk/build.properties.default
Author: markt
Date: Mon Jan 13 16:35:28 2014
New Revision: 1557766
URL: http://svn.apache.org/r1557766
Log:
I've been working on DBCP2 so snapshot version needs to be updated.
Modified:
tomcat/trunk/build.properties.default
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1557766r1=1557765r2=1557766view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Jan 13 16:35:28 2014
@@ -155,7 +155,7 @@ tomcat-native.win.2=${base-tomcat.loc.2}
#commons-dbcp.home=${base.path}/commons-dbcp-${commons-dbcp.version}-src
#commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
#commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
-commons-dbcp.version=2.0-20131211.114422-138
+commons-dbcp.version=2.0-20140113.123544-144
commons-dbcp.home=${base.path}/commons-dbcp2-2.0-SNAPSHOT-src
commons-dbcp-src.loc.1=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
commons-dbcp-src.loc.2=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55759] Update to ECJ 4.3.1
https://issues.apache.org/bugzilla/show_bug.cgi?id=55759 --- Comment #4 from Ralph Schaer ralphsch...@yahoo.com --- ecj 4.3.1 is now on the central maven repository. It took a while. I uploaded the bundle to sonatype in december and today it got finally approved. -- 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 55995] java.lang.NullPointerException at org.apache.jasper.servlet.JspCServletContext.getResource(JspCServletContext.java:344)
https://issues.apache.org/bugzilla/show_bug.cgi?id=55995 Mark Thomas ma...@apache.org changed: What|Removed |Added Severity|critical|normal --- Comment #2 from Mark Thomas ma...@apache.org --- Drop severity to a realistic level. It isn't functionality used by most users and in at least some cases JspC still works. -- 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 55995] java.lang.NullPointerException at org.apache.jasper.servlet.JspCServletContext.getResource(JspCServletContext.java:344)
https://issues.apache.org/bugzilla/show_bug.cgi?id=55995 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #1 from Mark Thomas ma...@apache.org --- I can't reproduce this with the latest 8.0.x source. Neither do I see anything in the change history since RC10 that looks like it would have fixed this. Without the JSP source it is hard to see what might be triggering this. Please provide the simplest possible JSP that demonstrates this issue along with any additional files (tags etc) that may be required to reproduce it. -- 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
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/5395 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1557766 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
[Bug 55996] Async context does not timeout with HTTP NIO connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=55996 Mark Thomas ma...@apache.org changed: What|Removed |Added Component|Catalina|Catalina Version|7.0.50 |trunk Product|Tomcat 7|Tomcat 8 Target Milestone|--- | Summary|Async context completes |Async context does not |with IllegalStateException |timeout with HTTP NIO |after around 10 seconds.|connector --- Comment #1 from Mark Thomas ma...@apache.org --- Tomcat 7 is behaving correctly. It is 8.0.x that has the bug. The Async context should timeout unless there is a call to dispatch() or complete() within the timeout. 8.0.x appears to be resetting the timeout counter on every write which is not correct. -- 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 56000] Tomcat should log xml validation errors by default.
https://issues.apache.org/bugzilla/show_bug.cgi?id=56000 --- Comment #2 from Juergen Weber juer...@jwi.de --- o the first application server of a novel JEE programmer is likely to be Tomcat, so it should be beginner friendly o first a code should work then comes optimization o parsing web.xml and initializing an app is not really a performance hotspot, this is only done once and not production-relevant -- 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 55995] java.lang.NullPointerException at org.apache.jasper.servlet.JspCServletContext.getResource(JspCServletContext.java:344)
https://issues.apache.org/bugzilla/show_bug.cgi?id=55995 --- Comment #3 from Konstantin Kolinko knst.koli...@gmail.com --- Created attachment 31203 -- https://issues.apache.org/bugzilla/attachment.cgi?id=31203action=edit jspc_55995_test.bat I can reproduce this NPE with 8.0-RC10 and with trunk. See the attached Windows batch file. Essentially, it uses Tomcat's bin/cpappend.bat to reproduce classpath from Comment 0. That is 1. ant.jar 2. all jars from %CATALINA_HOME%\bin and %CATALINA_HOME%\lib 3. libs from the examples webapp (the JSTL jars) Then it tries to compile examples\jsp\tagplugin\choose.jsp. This results in the same NullPointerException, as reported by OP. Exception in thread main java.lang.NullPointerException at org.apache.jasper.servlet.JspCServletContext.getResource(JspCServletContext.java:344) at org.apache.jasper.compiler.TldCache.getLastModified(TldCache.java:124) at org.apache.jasper.compiler.TldCache.init(TldCache.java:70) at org.apache.jasper.JspC.initServletContext(JspC.java:1468) at org.apache.jasper.JspC.execute(JspC.java:1321) at org.apache.jasper.JspC.main(JspC.java:269) 4. If I comment-out the line that adds JSTL jars to the classpath, JspC completes successfully and generates Java source text for the page. Note, that the JSTL tag library in the WEB-INF/lib directory of the web application is successfully recognized and processed by JspC. -- 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 56003] New: tool-wrapper.bat cannot report failures. because ExceptionUtils class is not on classpath
https://issues.apache.org/bugzilla/show_bug.cgi?id=56003
Bug ID: 56003
Summary: tool-wrapper.bat cannot report failures. because
ExceptionUtils class is not on classpath
Product: Tomcat 8
Version: 8.0.0-RC10
Hardware: PC
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: knst.koli...@gmail.com
If I do something that results in an error, e.g. using Java 7u45 and running
tool-wrapper.bat foo
it fails with
Exception in thread main java.lang.NoClassDefFoundError:
org/apache/tomcat/util/ExceptionUtils
at org.apache.catalina.startup.Tool.main(Tool.java:204)
Caused by: java.lang.ClassNotFoundException:
org.apache.tomcat.util.ExceptionUtils
at java.net.URLClassLoader$1.run(URLClassLoader.java:366)
at java.net.URLClassLoader$1.run(URLClassLoader.java:355)
at java.security.AccessController.doPrivileged(Native Method)
at java.net.URLClassLoader.findClass(URLClassLoader.java:354)
at java.lang.ClassLoader.loadClass(ClassLoader.java:425)
at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308)
at java.lang.ClassLoader.loadClass(ClassLoader.java:358)
... 1 more
The cause is that org.apache.catalina.startup.Tool depends on ExceptionUtils
class that is not present in bootstrap.jar.
When I do something successfully, e.g. run
digest.bat -a md5 helloworld
it completes successfully.
Alternatively, we can add lib/tomcat-util.jar to the classpath created by
tool-wrapper{.bat|.sh} script, or add the ExceptionUtils class to
bootstrap.jar.
Tool class also depends on org.apache.catalina.Globals, but that only pulls in
several constant strings and does not cause problems at runtime.
--
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/FIPS mode on RHEL6
Hello everyone, I have a Grails application running under Tomcat 6 on a RHEL6 box in FIPS-140 mode (install dracut-fips, disable prelink, rebuild initrd with 'dracut -f', add FIPS=1 and boot=bootpart to grub.conf). We require all connections be over SSL, and currently have been using the JSSE connectors. While browsers connect just fine, we've been unable to get our agent processes using a gsoap to connect to our application. The error is that the Diffie-Hellman key length is too short. Specifically error:0506706E:Diffie-Hellman routines: GENERATE_KEY:key size too smallerror:14098005:SSL routines:SSL3_SEND_CLIENT_KEY_EXCHANGE:DH lib. Googling this seemed to point the finger at the server end, and some additional followup indicated that the stock JSSE connectors were not capable of doing longer DH key sizes, such as would be required by FIPS. We're not in a position to require n alternate JSSE provider, so this dead-ended. I saw some notes that Tomcat *can* run in FIPS mode as of recent versions of TC6 and 7 using APR connectors with the TC native libraries. With a RHEL6.4 box in FIPS mode I was unable to get either version of Tomcat to pass the 'run-ssl-server' test. I had to play around a bit to execute mkcerts (change md5 to sha1) to get it to work, and then tweak the SSL.properties file to point at the generated certs, but then kept getting a 'This function has not been implemented on this platform' erro from 'ant run-ssl-server'. I *DID* finally get it to work, but I had to remove the line in native/src/ssl.c at line 77. This is in the SSL_TMP_KEY_INIT macro where it tries to generate the 512 bit RSA keys. Now the 'run-ssl-server' test works and I could connect. I could also get my app to run behind tomcat if I configured the APR listener *without* the FIPS=1 setting (otherwise startup still failed), and had full communications between my webserver and agent processes. Looking at that macro and how it is used it looks like if *any* of the RSA/DH key inits fail the entire process aborts. I would have thought is should have queries the openssl code for available RSA/DH options and tried those. Several folks that I talk with at work indicated that a 512 RSA keyset is not valid as per FIPS-140-2. I'm inexperienced enough with web stuff in general (inherited this code) and FIPS/crypto, so I wanted to toss what I found back to this list and see if I'm not understanding something correctly. Thank you, Rob - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1557934 - in /tomcat/site/trunk: docs/download-taglibs.html xdocs/download-taglibs.xml
Author: bayard Date: Tue Jan 14 05:14:16 2014 New Revision: 1557934 URL: http://svn.apache.org/r1557934 Log: Using canonical urls for the readmes rather than mirrors Modified: tomcat/site/trunk/docs/download-taglibs.html tomcat/site/trunk/xdocs/download-taglibs.xml Modified: tomcat/site/trunk/docs/download-taglibs.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-taglibs.html?rev=1557934r1=1557933r2=1557934view=diff == --- tomcat/site/trunk/docs/download-taglibs.html (original) +++ tomcat/site/trunk/docs/download-taglibs.html Tue Jan 14 05:14:16 2014 @@ -263,7 +263,7 @@ li -a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/README_src.txt rel=nofollowSource README/a +a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/README_src.txt; rel=nofollowSource README/a /li @@ -288,7 +288,7 @@ li -a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/README_bin.txt rel=nofollowBinary README/a +a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/README_bin.txt; rel=nofollowBinary README/a /li Modified: tomcat/site/trunk/xdocs/download-taglibs.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-taglibs.xml?rev=1557934r1=1557933r2=1557934view=diff == --- tomcat/site/trunk/xdocs/download-taglibs.xml (original) +++ tomcat/site/trunk/xdocs/download-taglibs.xml Tue Jan 14 05:14:16 2014 @@ -64,7 +64,7 @@ subsection name=Source Code Distributions ul li - a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/README_src.txt rel=nofollowSource README/a + a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/README_src.txt; rel=nofollowSource README/a /li li a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-1.2.1-source-release.zip rel=nofollowzip/a @@ -77,7 +77,7 @@ subsection name=Jar Files ul li - a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/README_bin.txt rel=nofollowBinary README/a + a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/README_bin.txt; rel=nofollowBinary README/a /li liImpl: ul - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1557933 - in /tomcat/site/trunk: docs/download-taglibs.html xdocs/download-taglibs.xml
Author: bayard Date: Tue Jan 14 05:13:13 2014 New Revision: 1557933 URL: http://svn.apache.org/r1557933 Log: Adding links to the source and binary readmes Modified: tomcat/site/trunk/docs/download-taglibs.html tomcat/site/trunk/xdocs/download-taglibs.xml Modified: tomcat/site/trunk/docs/download-taglibs.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-taglibs.html?rev=1557933r1=1557932r2=1557933view=diff == --- tomcat/site/trunk/docs/download-taglibs.html (original) +++ tomcat/site/trunk/docs/download-taglibs.html Tue Jan 14 05:13:13 2014 @@ -263,6 +263,12 @@ li +a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/README_src.txt rel=nofollowSource README/a + +/li + +li + a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-1.2.1-source-release.zip rel=nofollowzip/a (a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-1.2.1-source-release.zip.asc;pgp/a, a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-1.2.1-source-release.zip.md5;md5/a) @@ -280,6 +286,12 @@ ul +li + +a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/README_bin.txt rel=nofollowBinary README/a + +/li + liImpl: ul Modified: tomcat/site/trunk/xdocs/download-taglibs.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-taglibs.xml?rev=1557933r1=1557932r2=1557933view=diff == --- tomcat/site/trunk/xdocs/download-taglibs.xml (original) +++ tomcat/site/trunk/xdocs/download-taglibs.xml Tue Jan 14 05:13:13 2014 @@ -64,6 +64,9 @@ subsection name=Source Code Distributions ul li + a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/README_src.txt rel=nofollowSource README/a +/li +li a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-1.2.1-source-release.zip rel=nofollowzip/a (a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-1.2.1-source-release.zip.asc;pgp/a, a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-1.2.1-source-release.zip.md5;md5/a) @@ -73,6 +76,9 @@ subsection name=Jar Files ul +li + a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/README_bin.txt rel=nofollowBinary README/a +/li liImpl: ul li - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1557938 - in /tomcat/taglibs/site/src/site: site.xml xdoc/site/building.xml
Author: bayard Date: Tue Jan 14 05:35:43 2014 New Revision: 1557938 URL: http://svn.apache.org/r1557938 Log: Fixing up the building page to serve as a source repo page, and hooking back into the navigation Modified: tomcat/taglibs/site/src/site/site.xml tomcat/taglibs/site/src/site/xdoc/site/building.xml Modified: tomcat/taglibs/site/src/site/site.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/site/src/site/site.xml?rev=1557938r1=1557937r2=1557938view=diff == --- tomcat/taglibs/site/src/site/site.xml (original) +++ tomcat/taglibs/site/src/site/site.xml Tue Jan 14 05:35:43 2014 @@ -22,6 +22,7 @@ item name=Home href=index.html / item name=Using href=site/using.html / item name=Tutorial href=site/tutorial.html / + item name=Building/Source href=site/building.html / item name=News Archives href=site/news.html / /menu menu name=Our Taglibs Modified: tomcat/taglibs/site/src/site/xdoc/site/building.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/site/src/site/xdoc/site/building.xml?rev=1557938r1=1557937r2=1557938view=diff == --- tomcat/taglibs/site/src/site/xdoc/site/building.xml (original) +++ tomcat/taglibs/site/src/site/xdoc/site/building.xml Tue Jan 14 05:35:43 2014 @@ -1,5 +1,5 @@ ?xml version=1.0? -document url=./sourcedist.xml +document url=./building.xml properties titleBuilding Jakarta Taglibs/title @@ -9,26 +9,25 @@ section name=Prerequisites - pTo build Jakara Taglibs packages you need to install a href=http://maven.apache.org;Maven 2/a. /p + pTo build Jakara Taglibs packages you need to install a href=http://maven.apache.org;Maven/a. /p /section -section name=Building +section name=Building Trunk - bThe following applies to trunk and any releases containing a pom.xml. If the release contains a build.xml, refer to the a href=legacybuilding.htmlLegacy Building/a page. /b + pTo checkout and build the latest code in trunk, run: /p - pUntil we release the iParent POM/i, you will first need to svn checkout the - a href=http://svn.apache.org/repos/asf/jakarta/taglibs/proper/taglibs-parent/trunk;taglibs-parent/a:/p + ul +licodesvn co https://svn.apache.org/repos/asf/tomcat/taglibs/trunks apache-taglibs/code/li +licodecd apache-taglibs/code/li +licodemvn clean install/code/li + /ul - presvn co https://svn.apache.org/repos/asf/jakarta/taglibs/proper/taglibs-parent/trunk taglibs-parent/pre - - pThen you should execute codemvn clean install/code. Once you have done this you are ready to build the taglib. /p - - pObtain your taglib, either from a source download or from svn. To build a taglib, execute codemvn clean package/code. /p + pTo build only one of the taglibs, checkout the codetrunk//code directory for the subcomponent at codea href=https://svn.apache.org/repos/asf/tomcat/taglibs/;https://svn.apache.org/repos/asf/tomcat/taglibs//a/code and run codemvn clean install/code. /p /section -section name=Building the site +section name=Building amp; Deploying the Site pThe main site is built by checking out the site/ directory: /p @@ -36,13 +35,15 @@ pTaglib specific sites are built by directly from that taglib. /p - pTo build either - execute codemvn clean site/code. /p + pTo build, run codemvn clean site/code. /p + + pThe sites are deployed by copying their source onto the Tomcat site's docs directory, located in the Tomcat site project: a href=https://svn.apache.org/repos/asf/tomcat/site/trunk;https://svn.apache.org/repos/asf/tomcat/site/trunk/a. It's not a very automated solution. /p /section section name=Releasing -pTo build the tar.gz or .zip for a Taglibs release, execute codemvn clean assembly:assembly/code. /p +pTo build the tar.gz or .zip for a Taglibs release, run codemvn clean assembly:assembly/code. /p /section - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1557940 - in /tomcat/site/trunk: docs/download-taglibs.html xdocs/download-taglibs.xml
Author: bayard Date: Tue Jan 14 05:37:39 2014 New Revision: 1557940 URL: http://svn.apache.org/r1557940 Log: Adding Apache to the first header Modified: tomcat/site/trunk/docs/download-taglibs.html tomcat/site/trunk/xdocs/download-taglibs.xml Modified: tomcat/site/trunk/docs/download-taglibs.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-taglibs.html?rev=1557940r1=1557939r2=1557940view=diff == --- tomcat/site/trunk/docs/download-taglibs.html (original) +++ tomcat/site/trunk/docs/download-taglibs.html Tue Jan 14 05:37:39 2014 @@ -191,7 +191,7 @@ div id=mainRight div id=content h2 style=display: none;Content/h2 -h3 id=Taglibs_DownloadsTaglibs Downloads/h3 +h3 id=Apache_Taglibs_DownloadsApache Taglibs Downloads/h3 div class=text pWelcome to the Taglibs download page. This page provides download Modified: tomcat/site/trunk/xdocs/download-taglibs.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-taglibs.xml?rev=1557940r1=1557939r2=1557940view=diff == --- tomcat/site/trunk/xdocs/download-taglibs.xml (original) +++ tomcat/site/trunk/xdocs/download-taglibs.xml Tue Jan 14 05:37:39 2014 @@ -5,7 +5,7 @@ /properties body - section name=Taglibs Downloads + section name=Apache Taglibs Downloads pWelcome to the Taglibs download page. This page provides download links for obtaining the latest version of the Apache Standard Taglib, as well as links to the archives of older releases. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1557941 - in /tomcat/site/trunk: docs/download-taglibs.html xdocs/download-taglibs.xml
Author: bayard Date: Tue Jan 14 05:39:27 2014 New Revision: 1557941 URL: http://svn.apache.org/r1557941 Log: Putting the jar filename instead of the zip for the downloads Modified: tomcat/site/trunk/docs/download-taglibs.html tomcat/site/trunk/xdocs/download-taglibs.xml Modified: tomcat/site/trunk/docs/download-taglibs.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-taglibs.html?rev=1557941r1=1557940r2=1557941view=diff == --- tomcat/site/trunk/docs/download-taglibs.html (original) +++ tomcat/site/trunk/docs/download-taglibs.html Tue Jan 14 05:39:27 2014 @@ -297,7 +297,7 @@ li -a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-impl-1.2.1.jar rel=nofollowzip/a +a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-impl-1.2.1.jar rel=nofollowtaglibs-standard-impl-1.2.1.jar/a (a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-impl-1.2.1.jar.asc;pgp/a, a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-impl-1.2.1.jar.md5;md5/a) /li @@ -311,7 +311,7 @@ li -a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-spec-1.2.1.jar rel=nofollowzip/a +a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-spec-1.2.1.jar rel=nofollowtaglibs-standard-spec-1.2.1.jar/a (a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-spec-1.2.1.jar.asc;pgp/a, a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-spec-1.2.1.jar.md5;md5/a) /li @@ -325,7 +325,7 @@ li -a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-jstlel-1.2.1.jar rel=nofollowzip/a +a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-jstlel-1.2.1.jar rel=nofollowtaglibs-standard-jstlel-1.2.1.jar/a (a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-jstlel-1.2.1.jar.asc;pgp/a, a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-jstlel-1.2.1.jar.md5;md5/a) /li @@ -339,7 +339,7 @@ li -a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-compat-1.2.1.jar rel=nofollowzip/a +a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-compat-1.2.1.jar rel=nofollowtaglibs-standard-compat-1.2.1.jar/a (a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-compat-1.2.1.jar.asc;pgp/a, a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-compat-1.2.1.jar.md5;md5/a) /li Modified: tomcat/site/trunk/xdocs/download-taglibs.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-taglibs.xml?rev=1557941r1=1557940r2=1557941view=diff == --- tomcat/site/trunk/xdocs/download-taglibs.xml (original) +++ tomcat/site/trunk/xdocs/download-taglibs.xml Tue Jan 14 05:39:27 2014 @@ -82,7 +82,7 @@ liImpl: ul li -a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-impl-1.2.1.jar rel=nofollowzip/a +a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-impl-1.2.1.jar rel=nofollowtaglibs-standard-impl-1.2.1.jar/a (a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-impl-1.2.1.jar.asc;pgp/a, a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-impl-1.2.1.jar.md5;md5/a) /li @@ -91,7 +91,7 @@ liSpec: ul li -a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-spec-1.2.1.jar rel=nofollowzip/a +a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-spec-1.2.1.jar rel=nofollowtaglibs-standard-spec-1.2.1.jar/a (a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-spec-1.2.1.jar.asc;pgp/a, a href=https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-spec-1.2.1.jar.md5;md5/a) /li @@ -100,7 +100,7 @@ liEL: ul li -a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-jstlel-1.2.1.jar rel=nofollowzip/a +a href=[preferred]tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-jstlel-1.2.1.jar rel=nofollowtaglibs-standard-jstlel-1.2.1.jar/a (a
Re: svn commit: r1555177 - in /tomcat/taglibs: extended/trunk/ rdc/trunk/ rdc/trunk/taglibs-rdc-dist/ rdc/trunk/taglibs-rdc-examples/ rdc/trunk/taglibs-rdc/ site/ standard/trunk/ taglibs-parent/trunk/
On Sun, Jan 12, 2014 at 9:16 PM, Henri Yandell flame...@gmail.com wrote: My main concern is it makes inactive codebases seem alive. ie) extended looks as though there's been code change in the last 5 years instead of only having had code in it in 2009. Similar with RDC. On this topic, I've pinged Rahul offline to get his thoughts on retiring RDC to the Attic. I'm assuming he's not tracking the dev list. Hen
[Taglibs] Extended?
Any thoughts Jeremy on our containing tags outside of the Standard implementation? I was pondering folding the Extended one (which contains two very tiny tags) into the Standard taglib, or if you don't see any likelihood for adding new ones, just removing it. Hen
