Re: [VOTE] Release Apache Tomcat 8.0.0-RC7
2013/12/12 Mark Thomas ma...@apache.org
The proposed Apache Tomcat 8.0.0 release candidate 7 is now available
for voting.
Given this is a release candidate I am working on the basis that it is
equivalent to an alpha. The main changes since RC5 are:
- Better handling of generic types in the WebSocket 1.0 implementation
- Refactor resource handling for the class loader
- Add Cobertura support to the unit tests
- Remove anti-Jar locking feature and replace it with open stream
tracking
- Update to Commons Pool 2.0 release
- Complete refactoring of TLD handling including caching of parsed TLDs
- More consistent handling of XML validation options
- Much more detailed visibility of DBCP connections pools in JMX
- Better organisation of JMX beans in the default JConsole view
- Numerous bug fixes
It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.0-RC7/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-047/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_8_0_0_RC6/
The proposed 8.0.0-RC7 release is:
[ ] Broken - do not release
[ ] Alpha - go ahead and release as 8.0.0-RC7 alpha
I'm receiving NPE when testing an application with jsp that specifies tld
location with relative path:
java.lang.NullPointerException
org.apache.jasper.compiler.TldCache.getTaglibXml(TldCache.java:97)
org.apache.jasper.compiler.TagLibraryInfoImpl.init(TagLibraryInfoImpl.java:150)
org.apache.jasper.compiler.Parser.parseTaglibDirective(Parser.java:411)
org.apache.jasper.compiler.Parser.parseDirective(Parser.java:469)
org.apache.jasper.compiler.Parser.parseElements(Parser.java:1455)
org.apache.jasper.compiler.Parser.parse(Parser.java:139)
org.apache.jasper.compiler.ParserController.doParse(ParserController.java:229)
org.apache.jasper.compiler.ParserController.parse(ParserController.java:100)
org.apache.jasper.compiler.Compiler.generateJava(Compiler.java:200)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:375)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:355)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:342)
org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:557)
Here is a test case that I used:
Index: test/org/apache/jasper/runtime/TestPageContextImpl.java
===
--- test/org/apache/jasper/runtime/TestPageContextImpl.java (revision
1549955)
+++ test/org/apache/jasper/runtime/TestPageContextImpl.java (working copy)
@@ -50,4 +50,19 @@
Assert.assertTrue(body.contains(OK));
Assert.assertFalse(body.contains(FAIL));
}
+
+@Test
+public void testRelativeTldLocation() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File(test/webapp);
+tomcat.addWebapp(null, /test, appDir.getAbsolutePath());
+
+tomcat.start();
+
+ByteChunk res = new ByteChunk();
+
+int rc = getUrl(http://localhost:; + getPort() +
+/test/jsp/test.jsp, res, null);
+}
}
Index: test/webapp/jsp
===
--- test/webapp/jsp (revision 0)
+++ test/webapp/jsp (working copy)
Property changes on: test/webapp/jsp
___
Added: bugtraq:label
## -0,0 +1 ##
+Bugzilla ID (optional)
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID%
\ No newline at end of property
Added: bugtraq:message
## -0,0 +1 ##
+Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID%
\ No newline at end of property
Added: bugtraq:append
## -0,0 +1 ##
+false
\ No newline at end of property
Index: test/webapp/jsp/test.jsp
===
--- test/webapp/jsp/test.jsp(revision 0)
+++ test/webapp/jsp/test.jsp(working copy)
@@ -0,0 +1,2 @@
+%@ page contentType=text/plain %
+%@ taglib uri=../WEB-INF/test.tld prefix=test %
\ No newline at end of file
Index: test/webapp/jsp/test.jsp
===
--- test/webapp/jsp/test.jsp(revision 0)
+++ test/webapp/jsp/test.jsp(working copy)
Property changes on: test/webapp/jsp/test.jsp
___
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Re: [VOTE] Release Apache Standard Taglib 1.2.1
A very late and non-binding +1 :) On Wed, Nov 13, 2013 at 6:58 PM, Jeremy Boynes jboy...@apache.org wrote: I'd like to release Apache Standard Taglib 1.2.1. This is an update to the withdrawn 1.2.0, built with JDK 1.7.0_45 to address JavaDoc issues and incorporating feedback on the documentation. Maven Staging Repository: https://repository.apache.org/content/repositories/orgapachetomcat-132/ Source Distribution: https://repository.apache.org/content/repositories/orgapachetomcat-132/org/apache/taglibs/taglibs-standard/1.2.1/ SVN tag: https://svn.apache.org/repos/asf/tomcat/taglibs/standard/tags/taglibs-standard-1.2.1@ r1541786 https://svn.apache.org/r1541786 KEYS: https://svn.apache.org/repos/asf/tomcat/trunk/KEYS The proposed 1.2.1 release is: [ ] Broken - do not release [ ] OK - release as 1.2.1 Thanks Jeremy
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/5326 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1550658 Blamelist: kkolinko Build succeeded! sincerely, -The Buildbot
[Bug 55880] New: ajp processorCache's value is not equals concurrency user numbers
https://issues.apache.org/bugzilla/show_bug.cgi?id=55880 Bug ID: 55880 Summary: ajp processorCache's value is not equals concurrency user numbers Product: Tomcat 7 Version: 7.0.47 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Connectors Assignee: dev@tomcat.apache.org Reporter: chain...@gmail.com Created attachment 3 -- https://issues.apache.org/bugzilla/attachment.cgi?id=3action=edit use this web project test the bug. Hi,I find a problem like this: 1.deploy the attached web project:test.war 2.set tomcat jvmRoute 3.set apache correctly 4.use LoadRunner, make a 10 concurrency users request via ajp connector(apache) 5.you will find that in jconsole, MBean named 【Catalina-RequestProcessor-ajp-bio-8009】contains only two processors: AjpRequest1 and AjpRequest2 why in this scenario,the processorCache number not equals to concurrency user numbers? I think it should be euqals. Also, when i set tomcat ajp connector use nio. it's my configuration: Connector port=8009 protocol=org.apache.coyote.ajp.AjpNioProtocol redirectPort=8443 / Use LR send 10 concurrency users request again. Now the processor numbers become 6.But it still less than concurrency user number. Is this a Bug of ajp connector? Thanks in advance. -- 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 55821] parallel deployment should deploy latest version of webapp on startup
https://issues.apache.org/bugzilla/show_bug.cgi?id=55821 --- Comment #4 from Mark Thomas ma...@apache.org --- (In reply to Colin Freas from comment #3) If a lot of development building has occurred, there may be many versions of the webapp in autodeploy. At this point, using autodeploy parallel deployment together is not really tenable. Parallel deployment isn't intended to be used in a development environment. Yes, there may be these sessions written to disk, but what if there aren't? (Which case seems probable for the vast majority of developers during the vast majority of development.) Then have your deployment process for the new version undeploy the old version(s) at the same time. But how much of the combined deployment undeployment time of each version is taken up by undeployment? My marginally complex webapp on a nice machine takes about 45s to deploy. If there are 4 or 5 versions, I should expect to wait 5 minutes for Tomcat to start? Aside: You can use threaded deployment to reduce that to closer to 45s. To me it just appears like the undeployoldversions feature was not adequately engineered or tested to account for the case of multiple webapp versions on Tomcat start undeployOldVersions (case matters) and the parallel deployment feature was designed for use in production environments were a seamless switchover to a new version was required. It wasn't designed to be used the way you are trying to use it. It isn't clear why you are trying to use parallel deployment in a development environment. There may be better solutions to the problem you are trying to solve but that would be a discussion for the users mailing list. (to say nothing of the situation in which the old versions fail to undeploy, which leaves something to be desired as well.) Failed undeployments are the responsibility of the code that has opened a file and failed to close it. I am not aware of any such bugs currently open against Tomcat. The most likely cause is a bug in the web app or a library it is using. These are often tricky to track down. To help, Tomcat 8 has introduced a feature for tracing locked files. You may find it useful to test your problematic apps with Tomcat 8 and the traceLockedFiles option (ask on the users list of you need help with this - it is still very new and currently undocumented). -- 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 55880] ajp processorCache's value is not equals concurrency user numbers
https://issues.apache.org/bugzilla/show_bug.cgi?id=55880 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID OS||All --- Comment #1 from Mark Thomas ma...@apache.org --- Please direct your questions to the Tomcat users mailing list. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55867] When Cookie value is empty, double quotes are added
https://issues.apache.org/bugzilla/show_bug.cgi?id=55867 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #3 from Mark Thomas ma...@apache.org --- Generally Tomcat follows the principle of being flexible in what it accepts and strict about what it sends. This means that some bending of the specifications is permitted when processing input where there is no risk of any harm being done but anything sent by Tomcat will always be specification compliant. None of the cookie specs I am aware of allow name only cookies so while Tomcat can optionally be configured to accept them, Tomcat will never send one. Note that even RFC6265 states that such a cookie should be ignored. I'll also mention at this point that Tomcat takes a slightly less tolerant view of non-compliant cookies (requiring an explicit option to be set to process them) due to past security issues involving malformed cookies. If some other system can't handle a specification compliant cookie with a name-value pair of test= then that is a bug in that system. The Tomcat project generally avoids adding workarounds for 3rd party components that can't process specification compliant responses. -- 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: [VOTE] Release Apache Tomcat 8.0.0-RC7
2013/12/13 Violeta Georgieva miles...@gmail.com I'm receiving NPE when testing an application with jsp that specifies tld location with relative path: java.lang.NullPointerException org.apache.jasper.compiler.TldCache.getTaglibXml(TldCache.java:97) org.apache.jasper.compiler.TagLibraryInfoImpl.init(TagLibraryInfoImpl.java:150) org.apache.jasper.compiler.Parser.parseTaglibDirective(Parser.java:411) org.apache.jasper.compiler.Parser.parseDirective(Parser.java:469) org.apache.jasper.compiler.Parser.parseElements(Parser.java:1455) org.apache.jasper.compiler.Parser.parse(Parser.java:139) org.apache.jasper.compiler.ParserController.doParse(ParserController.java:229) org.apache.jasper.compiler.ParserController.parse(ParserController.java:100) org.apache.jasper.compiler.Compiler.generateJava(Compiler.java:200) org.apache.jasper.compiler.Compiler.compile(Compiler.java:375) org.apache.jasper.compiler.Compiler.compile(Compiler.java:355) org.apache.jasper.compiler.Compiler.compile(Compiler.java:342) org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:557) There used to be some normalization code for the taglib uri, like uri = RequestUtil.normalize(uri); in TagLibraryInfoImpl.generateTLDLocation (now generateTldResourcePath), and since the uri is used to match the catch entry, I don't see how it can work without it. I'll add it back. Rémy
svn commit: r1550695 - in /tomcat/trunk: java/org/apache/jasper/compiler/TagLibraryInfoImpl.java test/org/apache/jasper/compiler/TestTagLibraryInfo.java test/webapp/jsp/ test/webapp/jsp/test.jsp
Author: remm
Date: Fri Dec 13 11:55:32 2013
New Revision: 1550695
URL: http://svn.apache.org/r1550695
Log:
Add back uri normalization for cache lookup. Test submitted by Violeta
Georgieva.
Added:
tomcat/trunk/test/org/apache/jasper/compiler/TestTagLibraryInfo.java
tomcat/trunk/test/webapp/jsp/
tomcat/trunk/test/webapp/jsp/test.jsp
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=1550695r1=1550694r2=1550695view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java Fri
Dec 13 11:55:32 2013
@@ -46,6 +46,7 @@ import org.apache.tomcat.util.descriptor
import org.apache.tomcat.util.descriptor.tld.TaglibXml;
import org.apache.tomcat.util.descriptor.tld.TldResourcePath;
import org.apache.tomcat.util.descriptor.tld.ValidatorXml;
+import org.apache.tomcat.util.http.RequestUtil;
import org.apache.tomcat.util.scan.Jar;
/**
@@ -214,6 +215,9 @@ class TagLibraryInfoImpl extends TagLibr
} else if (uri.charAt(0) != '/') {
// noroot_rel_uri, resolve against the current JSP page
uri = ctxt.resolveRelativeUri(uri);
+if (uri != null) {
+uri = RequestUtil.normalize(uri);
+}
}
URL url = null;
Added: tomcat/trunk/test/org/apache/jasper/compiler/TestTagLibraryInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestTagLibraryInfo.java?rev=1550695view=auto
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestTagLibraryInfo.java (added)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestTagLibraryInfo.java Fri
Dec 13 11:55:32 2013
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jasper.compiler;
+
+import java.io.File;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+/**
+ * Test case for {@link TagLibraryInfo}.
+ */
+public class TestTagLibraryInfo extends TomcatBaseTest {
+
+@Test
+public void testRelativeTldLocation() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File(test/webapp);
+tomcat.addWebapp(null, /test, appDir.getAbsolutePath());
+
+tomcat.start();
+
+ByteChunk res = new ByteChunk();
+
+int rc = getUrl(http://localhost:; + getPort() +
+/test/jsp/test.jsp, res, null);
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+}
+
+}
Added: tomcat/trunk/test/webapp/jsp/test.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/test.jsp?rev=1550695view=auto
==
--- tomcat/trunk/test/webapp/jsp/test.jsp (added)
+++ tomcat/trunk/test/webapp/jsp/test.jsp Fri Dec 13 11:55:32 2013
@@ -0,0 +1,2 @@
++%@ page contentType=text/plain %
++%@ taglib uri=../WEB-INF/test.tld prefix=test %
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1550696 - /tomcat/trunk/test/webapp/jsp/test.jsp
Author: remm Date: Fri Dec 13 11:58:21 2013 New Revision: 1550696 URL: http://svn.apache.org/r1550696 Log: Fix my typos in the test.jsp test file. Modified: tomcat/trunk/test/webapp/jsp/test.jsp Modified: tomcat/trunk/test/webapp/jsp/test.jsp URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/test.jsp?rev=1550696r1=1550695r2=1550696view=diff == --- tomcat/trunk/test/webapp/jsp/test.jsp (original) +++ tomcat/trunk/test/webapp/jsp/test.jsp Fri Dec 13 11:58:21 2013 @@ -1,2 +1,2 @@ -+%@ page contentType=text/plain % -+%@ taglib uri=../WEB-INF/test.tld prefix=test % +%@ page contentType=text/plain % +%@ taglib uri=../WEB-INF/test.tld prefix=test % - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1550697 - /tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Author: markt
Date: Fri Dec 13 12:02:35 2013
New Revision: 1550697
URL: http://svn.apache.org/r1550697
Log:
Fix IDE warning = uri can't be null here
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=1550697r1=1550696r2=1550697view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java Fri
Dec 13 12:02:35 2013
@@ -215,9 +215,7 @@ class TagLibraryInfoImpl extends TagLibr
} else if (uri.charAt(0) != '/') {
// noroot_rel_uri, resolve against the current JSP page
uri = ctxt.resolveRelativeUri(uri);
-if (uri != null) {
-uri = RequestUtil.normalize(uri);
-}
+uri = RequestUtil.normalize(uri);
}
URL url = null;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1550701 - /tomcat/trunk/test/webapp/jsp/test.jsp
Author: markt Date: Fri Dec 13 12:05:42 2013 New Revision: 1550701 URL: http://svn.apache.org/r1550701 Log: Add missing license header Modified: tomcat/trunk/test/webapp/jsp/test.jsp Modified: tomcat/trunk/test/webapp/jsp/test.jsp URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/test.jsp?rev=1550701r1=1550700r2=1550701view=diff == --- tomcat/trunk/test/webapp/jsp/test.jsp (original) +++ tomcat/trunk/test/webapp/jsp/test.jsp Fri Dec 13 12:05:42 2013 @@ -1,2 +1,18 @@ +%-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--% %@ page contentType=text/plain % %@ taglib uri=../WEB-INF/test.tld prefix=test % - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1550705 - in /tomcat/trunk/test/org/apache/jasper/compiler: TestTagLibraryInfo.java TestTagLibraryInfoImpl.java
Author: markt
Date: Fri Dec 13 12:22:48 2013
New Revision: 1550705
URL: http://svn.apache.org/r1550705
Log:
Rename to match class being tested.
Fix Javadoc warning.
Added:
tomcat/trunk/test/org/apache/jasper/compiler/TestTagLibraryInfoImpl.java
- copied, changed from r1550701,
tomcat/trunk/test/org/apache/jasper/compiler/TestTagLibraryInfo.java
Removed:
tomcat/trunk/test/org/apache/jasper/compiler/TestTagLibraryInfo.java
Copied:
tomcat/trunk/test/org/apache/jasper/compiler/TestTagLibraryInfoImpl.java (from
r1550701, tomcat/trunk/test/org/apache/jasper/compiler/TestTagLibraryInfo.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestTagLibraryInfoImpl.java?p2=tomcat/trunk/test/org/apache/jasper/compiler/TestTagLibraryInfoImpl.javap1=tomcat/trunk/test/org/apache/jasper/compiler/TestTagLibraryInfo.javar1=1550701r2=1550705rev=1550705view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestTagLibraryInfo.java
(original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestTagLibraryInfoImpl.java
Fri Dec 13 12:22:48 2013
@@ -28,9 +28,9 @@ import org.apache.catalina.startup.Tomca
import org.apache.tomcat.util.buf.ByteChunk;
/**
- * Test case for {@link TagLibraryInfo}.
+ * Test case for {@link TagLibraryInfoImpl}.
*/
-public class TestTagLibraryInfo extends TomcatBaseTest {
+public class TestTagLibraryInfoImpl extends TomcatBaseTest {
@Test
public void testRelativeTldLocation() throws Exception {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1550707 - /tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Author: markt
Date: Fri Dec 13 12:24:01 2013
New Revision: 1550707
URL: http://svn.apache.org/r1550707
Log:
Alternative fix for normalization issue that doesn't depend on RequestUtils
which isn't available to Jasper.
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1550707r1=1550706r2=1550707view=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Fri
Dec 13 12:24:01 2013
@@ -229,6 +229,7 @@ jsp.error.internal.filenotfound=Internal
jsp.error.parse.xml.invalidPublicId=Invalid PUBLIC ID: {0}
jsp.error.unsupported.encoding=Unsupported encoding: {0}
jsp.error.taglibDirective.absUriCannotBeResolved=The absolute uri: {0} cannot
be resolved in either web.xml or the jar files deployed with this application
+jsp.error.taglibDirective.uriInvalid=The URI provided for a tag library [{0}]
is not a valid URI
jsp.error.taglibDirective.missing.location=Neither \'uri\' nor \'tagdir\'
attribute specified
jsp.error.taglibDirective.both_uri_and_tagdir=Both \'uri\' and \'tagdir\'
attributes specified
jsp.error.invalid.tagdir=Tag file directory {0} does not start with
\/WEB-INF/tags\
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1550706 - /tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Author: markt
Date: Fri Dec 13 12:23:44 2013
New Revision: 1550706
URL: http://svn.apache.org/r1550706
Log:
Alternative fix for normalization issue that doesn't depend on RequestUtils
which isn't available to Jasper.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=1550706r1=1550705r2=1550706view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java Fri
Dec 13 12:23:44 2013
@@ -19,6 +19,8 @@ package org.apache.jasper.compiler;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
@@ -46,7 +48,6 @@ import org.apache.tomcat.util.descriptor
import org.apache.tomcat.util.descriptor.tld.TaglibXml;
import org.apache.tomcat.util.descriptor.tld.TldResourcePath;
import org.apache.tomcat.util.descriptor.tld.ValidatorXml;
-import org.apache.tomcat.util.http.RequestUtil;
import org.apache.tomcat.util.scan.Jar;
/**
@@ -215,7 +216,17 @@ class TagLibraryInfoImpl extends TagLibr
} else if (uri.charAt(0) != '/') {
// noroot_rel_uri, resolve against the current JSP page
uri = ctxt.resolveRelativeUri(uri);
-uri = RequestUtil.normalize(uri);
+try {
+// Can't use RequestUtils.normalize since that package is not
+// available to Jasper.
+uri = (new URI(uri)).normalize().toString();
+if (uri.startsWith(../)) {
+// Trying to go outside context root
+err.jspError(jsp.error.taglibDirective.uriInvalid, uri);
+}
+} catch (URISyntaxException e) {
+err.jspError(jsp.error.taglibDirective.uriInvalid, uri);
+}
}
URL url = null;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.49
2013/12/12 Rainer Jung rainer.j...@kippdata.de On 11.12.2013 10:41, Violeta Georgieva wrote: The proposed Apache Tomcat 7.0.49 release is now available for voting. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.49/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-042/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_49/ The proposed 7.0.49 release is: [X] Broken - do not release [ ] Stable - go ahead and release as 7.0.49 Stable Don't shoot the messenger, although in this case I'm also the culprit: after 7.0.47 we updated our commons-logging dependency from 1.1.1 to 1.1.3. As part of that I kept the Log4J dependency on 1.2.12 because I wanted to minimize update risks for users. Unfortunately CL 1.1.3 wants Log4J 1.2.17 to build its Log4J adapters which we ship in the extras jar file. The currently prepared adapter extras jar thus no longer contains the log4j adapter, which I think is important. I fixed our Log4J dependency to use 1.2.17 and the build of the extras logging jars now again works for me. Nevertheless I also see three test suite failures, which might again be sporadical: 1) nio org.apache.catalina.websocket.TestWebSocket Tests run: 6, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 15.045 sec Testcase: testKey took 3.834 sec Testcase: testBug53339 took 10.306 sec Caused an ERROR Read timed out java.net.SocketTimeoutException: Read timed out at java.net.SocketInputStream.socketRead0(Native Method) at java.net.SocketInputStream.read(SocketInputStream.java:152) at java.net.SocketInputStream.read(SocketInputStream.java:122) at java.net.SocketInputStream.read(SocketInputStream.java:210) at org.apache.catalina.websocket.TestWebSocket$WebSocketClient.readMessage(TestWebSocket.java:456) at org.apache.catalina.websocket.TestWebSocket$WebSocketClient.access$300(TestWebSocket.java:383) at org.apache.catalina.websocket.TestWebSocket.testBug53339(TestWebSocket.java:327) Testcase: testDetectWrongVersion took 0.225 sec Testcase: testNoUpgrade took 0.211 sec Testcase: testNoConnection took 0.154 sec Testcase: testSimple took 0.234 sec 2) nio org.apache.catalina.loader.TestWebappClassLoaderMemoryLeak Tests run: 1, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 3.813 sec Testcase: testTimerThreadLeak took 3.759 sec FAILED Timer thread still running junit.framework.AssertionFailedError: Timer thread still running at org.apache.catalina.loader.TestWebappClassLoaderMemoryLeak.testTimerThreadLeak(TestWebappClassLoaderMemoryLeak.java:72) although the test output says: Dec 12, 2013 12:29:49 PM org.apache.catalina.loader.WebappClassLoader clearReferencesStopTimerThread SEVERE: The web application [] appears to have started a TimerThread named [leaked-thread] via the java.util.Timer API but has failed to stop it. To prevent a memory leak, the timer (and hence the associated thread) has been forcibly canceled. 3) apr org.apache.catalina.websocket.TestWebSocket Tests run: 6, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 9.261 sec Testcase: testKey took 4.565 sec Caused an ERROR Failed to stop component [StandardServer[-1]] org.apache.catalina.LifecycleException: Failed to stop component [StandardServer[-1]] at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:236) at org.apache.catalina.startup.Tomcat.stop(Tomcat.java:351) at org.apache.catalina.startup.TomcatBaseTest.tearDown(TomcatBaseTest.java:161) Caused by: org.apache.catalina.LifecycleException: Failed to stop component [StandardService[Tomcat]] at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:236) at org.apache.catalina.core.StandardServer.stopInternal(StandardServer.java:753) at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:232) Caused by: org.apache.catalina.LifecycleException: Failed to stop component [StandardEngine[Tomcat]] at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:236) at org.apache.catalina.core.StandardService.stopInternal(StandardService.java:502) at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:232) Caused by: org.apache.catalina.LifecycleException: A child container failed during stop at org.apache.catalina.core.ContainerBase.stopInternal(ContainerBase.java:1186) at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:232) Testcase: testBug53339 took 0.466 sec Testcase: testDetectWrongVersion took 1.821 sec Testcase: testNoUpgrade took 0.769 sec Testcase: testNoConnection took 0.741 sec Testcase: testSimple took 0.825 sec The stop problem seems to be due to the following ConcurrentModificationException: Dec 12, 2013 1:07:37 PM
svn commit: r3887 - /dev/tomcat/tomcat-7/v7.0.49/
Author: violetagg Date: Fri Dec 13 12:32:33 2013 New Revision: 3887 Log: 7.0.49 did not pass the vote - dropping. Removed: dev/tomcat/tomcat-7/v7.0.49/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r3887 - /dev/tomcat/tomcat-7/v7.0.49/
Author: violetagg Date: Fri Dec 13 12:32:33 2013 New Revision: 3887 Log: 7.0.49 did not pass the vote - dropping. Removed: dev/tomcat/tomcat-7/v7.0.49/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1550720 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: violetagg Date: Fri Dec 13 13:11:32 2013 New Revision: 1550720 URL: http://svn.apache.org/r1550720 Log: Mark 7.0.49 as not released based on the vote results. Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml 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=1550720r1=1550719r2=1550720view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Dec 13 13:11:32 2013 @@ -86,8 +86,16 @@ /fix /changelog /subsection + subsection name=Other +changelog + update +Update Apache Avalon Framework to version 4.1.5. Update Apache Log4J +version 1.2.17. (rjung) + /update +/changelog + /subsection /section -section name=Tomcat 7.0.49 (violetagg) +section name=Tomcat 7.0.49 (violetagg) rtext=not released subsection name=Catalina changelog fix - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.0-RC7
2013/12/12 Mark Thomas ma...@apache.org
The proposed Apache Tomcat 8.0.0 release candidate 7 is now available
for voting.
Given this is a release candidate I am working on the basis that it is
equivalent to an alpha. The main changes since RC5 are:
- Better handling of generic types in the WebSocket 1.0 implementation
- Refactor resource handling for the class loader
- Add Cobertura support to the unit tests
- Remove anti-Jar locking feature and replace it with open stream
tracking
- Update to Commons Pool 2.0 release
- Complete refactoring of TLD handling including caching of parsed TLDs
- More consistent handling of XML validation options
- Much more detailed visibility of DBCP connections pools in JMX
- Better organisation of JMX beans in the default JConsole view
- Numerous bug fixes
It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.0-RC7/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-047/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_8_0_0_RC6/
The proposed 8.0.0-RC7 release is:
[ ] Broken - do not release
[ ] Alpha - go ahead and release as 8.0.0-RC7 alpha
I found another issue:
If a tag file is placed in a jar file in WEB-INF/lib and then is used, the
following exception appears:
org.apache.jasper.JasperException: Illegal tag file path:
/META-INF/tags/my.tag, must start with /WEB-INF/tags or /META-INF/tags
org.apache.jasper.compiler.DefaultErrorHandler.jspError(DefaultErrorHandler.java:56)
org.apache.jasper.compiler.ErrorDispatcher.dispatch(ErrorDispatcher.java:278)
org.apache.jasper.compiler.ErrorDispatcher.jspError(ErrorDispatcher.java:76)
org.apache.jasper.compiler.TagLibraryInfoImpl.createTagFileInfo(TagLibraryInfoImpl.java:287)
org.apache.jasper.compiler.TagLibraryInfoImpl.init(TagLibraryInfoImpl.java:171)
org.apache.jasper.compiler.Parser.parseTaglibDirective(Parser.java:411)
org.apache.jasper.compiler.Parser.parseDirective(Parser.java:469)
org.apache.jasper.compiler.Parser.parseElements(Parser.java:1455)
org.apache.jasper.compiler.Parser.parse(Parser.java:139)
org.apache.jasper.compiler.ParserController.doParse(ParserController.java:229)
org.apache.jasper.compiler.ParserController.parse(ParserController.java:100)
org.apache.jasper.compiler.Compiler.generateJava(Compiler.java:200)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:375)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:355)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:342)
org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:557)
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:357)
The change in the code is introduced with r1541960
Besides that the message is wrong because we check only for WEB-INF/tags
[1], what should be done in addition?
[1]
org.apache.jasper.compiler.TagLibraryInfoImpl.createTagFileInfo(TagFileXml,
Jar)
286} else if (!path.startsWith(/WEB-INF/tags)) {
287err.jspError(jsp.error.tagfile.illegalPath, path);
288}
svn commit: r1550739 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Fri Dec 13 14:32:11 2013 New Revision: 1550739 URL: http://svn.apache.org/r1550739 Log: Followup to r1550720: improve the changelog message. Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml 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=1550739r1=1550738r2=1550739view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Dec 13 14:32:11 2013 @@ -86,10 +86,11 @@ /fix /changelog /subsection - subsection name=Other + subsection name=Extras changelog update -Update Apache Avalon Framework to version 4.1.5. Update Apache Log4J +Update dependencies that are used to build tomcat-juli extras component. +Apache Avalon Framework is updated to version 4.1.5, Apache Log4J to version 1.2.17. (rjung) /update /changelog - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.0-RC7
2013/12/13 Violeta Georgieva miles...@gmail.com
I found another issue:
If a tag file is placed in a jar file in WEB-INF/lib and then is used, the
The change in the code is introduced with r1541960
Besides that the message is wrong because we check only for WEB-INF/tags
[1], what should be done in addition?
[1]
org.apache.jasper.compiler.TagLibraryInfoImpl.createTagFileInfo(TagFileXml,
Jar)
286} else if (!path.startsWith(/WEB-INF/tags)) {
287err.jspError(jsp.error.tagfile.illegalPath, path);
288}
It looks like the condition was not refactored correctly.
Rémy
svn commit: r1550740 - /tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Author: remm
Date: Fri Dec 13 14:34:41 2013
New Revision: 1550740
URL: http://svn.apache.org/r1550740
Log:
startsWith(/META-INF/tags) used to be allowed, but needed a specific hack
(that was removed along with the check, unfortunately).
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=1550740r1=1550739r2=1550740view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java Fri
Dec 13 14:34:41 2013
@@ -283,7 +283,7 @@ class TagLibraryInfoImpl extends TagLibr
if (path == null) {
// path is required
err.jspError(jsp.error.tagfile.missingPath);
-} else if (!path.startsWith(/WEB-INF/tags)) {
+} else if (!path.startsWith(/META-INF/tags)
!path.startsWith(/WEB-INF/tags)) {
err.jspError(jsp.error.tagfile.illegalPath, path);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1550741 - in /tomcat/trunk/test: org/apache/jasper/compiler/TestTagLibraryInfoImpl.java webapp/jsp/test.jsp
Author: kkolinko Date: Fri Dec 13 14:38:37 2013 New Revision: 1550741 URL: http://svn.apache.org/r1550741 Log: Followup to r1550695: svn:eol-style=native Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestTagLibraryInfoImpl.java (props changed) tomcat/trunk/test/webapp/jsp/test.jsp (props changed) Propchange: tomcat/trunk/test/org/apache/jasper/compiler/TestTagLibraryInfoImpl.java -- svn:eol-style = native Propchange: tomcat/trunk/test/webapp/jsp/test.jsp -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1550743 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Author: markt
Date: Fri Dec 13 14:43:53 2013
New Revision: 1550743
URL: http://svn.apache.org/r1550743
Log:
Fix a find bugs warning about String comparison
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1550743r1=1550742r2=1550743view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Fri Dec 13
14:43:53 2013
@@ -177,7 +177,7 @@ public class HostConfig
String oldContextClass = this.contextClass;
this.contextClass = contextClass;
-if (oldContextClass != contextClass) {
+if (!oldContextClass.equals(contextClass)) {
synchronized (digesterLock) {
digester = createDigester(getContextClass());
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.0-RC7
On 13/12/2013 14:35, Rémy Maucherat wrote:
2013/12/13 Violeta Georgieva miles...@gmail.com
I found another issue:
If a tag file is placed in a jar file in WEB-INF/lib and then is used, the
The change in the code is introduced with r1541960
Besides that the message is wrong because we check only for WEB-INF/tags
[1], what should be done in addition?
[1]
org.apache.jasper.compiler.TagLibraryInfoImpl.createTagFileInfo(TagFileXml,
Jar)
286} else if (!path.startsWith(/WEB-INF/tags)) {
287err.jspError(jsp.error.tagfile.illegalPath, path);
288}
It looks like the condition was not refactored correctly.
Thanks for the fix. I'll roll an RC8 later today.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1550744 - in /tomcat/trunk: java/org/apache/catalina/WebResourceTraceWrapper.java java/org/apache/catalina/webresources/TraceWrapperInputStream.java test/org/apache/catalina/startup/servi
Author: kkolinko Date: Fri Dec 13 14:45:38 2013 New Revision: 1550744 URL: http://svn.apache.org/r1550744 Log: svn:eol-style=native Modified: tomcat/trunk/java/org/apache/catalina/WebResourceTraceWrapper.java (props changed) tomcat/trunk/java/org/apache/catalina/webresources/TraceWrapperInputStream.java (props changed) tomcat/trunk/test/org/apache/catalina/startup/service-config.txt (props changed) tomcat/trunk/webapps/docs/rewrite.xml (props changed) Propchange: tomcat/trunk/java/org/apache/catalina/WebResourceTraceWrapper.java -- svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/webresources/TraceWrapperInputStream.java -- svn:eol-style = native Propchange: tomcat/trunk/test/org/apache/catalina/startup/service-config.txt -- svn:eol-style = native Propchange: tomcat/trunk/webapps/docs/rewrite.xml -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.0-RC7
2013/12/13 Rémy Maucherat r...@apache.org
2013/12/13 Violeta Georgieva miles...@gmail.com
I found another issue:
If a tag file is placed in a jar file in WEB-INF/lib and then is used,
the
The change in the code is introduced with r1541960
Besides that the message is wrong because we check only for WEB-INF/tags
[1], what should be done in addition?
[1]
org.apache.jasper.compiler.TagLibraryInfoImpl.createTagFileInfo(TagFileXml,
Jar)
286} else if (!path.startsWith(/WEB-INF/tags)) {
287err.jspError(jsp.error.tagfile.illegalPath, path);
288}
It looks like the condition was not refactored correctly.
Unfortunately with that fix I'm receiving FNF:
java.io.FileNotFoundException: /META-INF/tags/my.tag
org.apache.jasper.servlet.JspServletWrapper.loadTagFile(JspServletWrapper.java:235)
org.apache.jasper.compiler.TagFileProcessor.loadTagFile(TagFileProcessor.java:579)
org.apache.jasper.compiler.TagFileProcessor.access$000(TagFileProcessor.java:50)
org.apache.jasper.compiler.TagFileProcessor$TagFileLoaderVisitor.visit(TagFileProcessor.java:661)
org.apache.jasper.compiler.Node$CustomTag.accept(Node.java:1521)
org.apache.jasper.compiler.Node$Nodes.visit(Node.java:2359)
org.apache.jasper.compiler.Node$Visitor.visitBody(Node.java:2411)
org.apache.jasper.compiler.Node$Visitor.visit(Node.java:2417)
org.apache.jasper.compiler.Node$Root.accept(Node.java:464)
org.apache.jasper.compiler.Node$Nodes.visit(Node.java:2359)
org.apache.jasper.compiler.TagFileProcessor.loadTagFiles(TagFileProcessor.java:679)
org.apache.jasper.compiler.Compiler.generateJava(Compiler.java:231)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:375)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:355)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:342)
org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:557)
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:357)
I'll try to create a test case for that.
Re: [VOTE] Release Apache Tomcat 8.0.0-RC7
2013/12/13 Violeta Georgieva miles...@gmail.com
Unfortunately with that fix I'm receiving FNF:
java.io.FileNotFoundException: /META-INF/tags/my.tag
org.apache.jasper.servlet.JspServletWrapper.loadTagFile(JspServletWrapper.java:235)
org.apache.jasper.compiler.TagFileProcessor.loadTagFile(TagFileProcessor.java:579)
org.apache.jasper.compiler.TagFileProcessor.access$000(TagFileProcessor.java:50)
org.apache.jasper.compiler.TagFileProcessor$TagFileLoaderVisitor.visit(TagFileProcessor.java:661)
org.apache.jasper.compiler.Node$CustomTag.accept(Node.java:1521)
org.apache.jasper.compiler.Node$Nodes.visit(Node.java:2359)
org.apache.jasper.compiler.Node$Visitor.visitBody(Node.java:2411)
org.apache.jasper.compiler.Node$Visitor.visit(Node.java:2417)
org.apache.jasper.compiler.Node$Root.accept(Node.java:464)
org.apache.jasper.compiler.Node$Nodes.visit(Node.java:2359)
org.apache.jasper.compiler.TagFileProcessor.loadTagFiles(TagFileProcessor.java:679)
org.apache.jasper.compiler.Compiler.generateJava(Compiler.java:231)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:375)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:355)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:342)
org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:557)
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:357)
I'll try to create a test case for that.
The JspCompilationContext used to keep a map of the JarResource
corresponding to the tags:
public JarResource getTagFileJarResource(String tagFile) {
return this.tagFileJarUrls.get(tagFile);
}
public void setTagFileJarResource(String tagFile, JarResource
jarResource) {
this.tagFileJarUrls.put(tagFile, jarResource);
}
This was set in TagLibraryInfoImpl.createTagFileInfo and then used by the
TagFileProcessor.loadTagFile. This should be ok without it because the code
keeps around the Jar instead and uses the entry name now, but apparently
something is still missing and the removed flag gets set (this is what
causes this exception).
So I guess add a test, it can't hurt.
Rémy
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/5328 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1550707 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
Re: [VOTE] Release Apache Tomcat 8.0.0-RC7
2013/12/13 Rémy Maucherat r...@apache.org
2013/12/13 Violeta Georgieva miles...@gmail.com
Unfortunately with that fix I'm receiving FNF:
java.io.FileNotFoundException: /META-INF/tags/my.tag
org.apache.jasper.servlet.JspServletWrapper.loadTagFile(JspServletWrapper.java:235)
org.apache.jasper.compiler.TagFileProcessor.loadTagFile(TagFileProcessor.java:579)
org.apache.jasper.compiler.TagFileProcessor.access$000(TagFileProcessor.java:50)
org.apache.jasper.compiler.TagFileProcessor$TagFileLoaderVisitor.visit(TagFileProcessor.java:661)
org.apache.jasper.compiler.Node$CustomTag.accept(Node.java:1521)
org.apache.jasper.compiler.Node$Nodes.visit(Node.java:2359)
org.apache.jasper.compiler.Node$Visitor.visitBody(Node.java:2411)
org.apache.jasper.compiler.Node$Visitor.visit(Node.java:2417)
org.apache.jasper.compiler.Node$Root.accept(Node.java:464)
org.apache.jasper.compiler.Node$Nodes.visit(Node.java:2359)
org.apache.jasper.compiler.TagFileProcessor.loadTagFiles(TagFileProcessor.java:679)
org.apache.jasper.compiler.Compiler.generateJava(Compiler.java:231)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:375)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:355)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:342)
org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:557)
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:357)
I'll try to create a test case for that.
The JspCompilationContext used to keep a map of the JarResource
corresponding to the tags:
public JarResource getTagFileJarResource(String tagFile) {
return this.tagFileJarUrls.get(tagFile);
}
public void setTagFileJarResource(String tagFile, JarResource
jarResource) {
this.tagFileJarUrls.put(tagFile, jarResource);
}
This was set in TagLibraryInfoImpl.createTagFileInfo and then used by the
TagFileProcessor.loadTagFile. This should be ok without it because the
code
keeps around the Jar instead and uses the entry name now, but apparently
something is still missing and the removed flag gets set (this is what
causes this exception).
So I guess add a test, it can't hurt.
Here [1] is the test
[1] https://www.dropbox.com/s/3zd106lpqfb3ytv/test.zip
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/5329 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1550744 Blamelist: kkolinko,markt,remm Build succeeded! sincerely, -The Buildbot
svn commit: r1550823 - /tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
Author: remm
Date: Fri Dec 13 19:45:52 2013
New Revision: 1550823
URL: http://svn.apache.org/r1550823
Log:
Fix getting last modified for tagfiles in JAR so that it is not marked as not
found. I chose to not fix and use getResource in that case (it looked slower to
go through the URL since the point is to avoid using JAR URLs I suppose), but
this could need fixing too just in case it is used.
Modified:
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=1550823r1=1550822r2=1550823view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Fri Dec 13
19:45:52 2013
@@ -350,16 +350,23 @@ public class JspCompilationContext {
long result = -1;
URLConnection uc = null;
try {
-URL jspUrl = getResource(resource);
-if (jspUrl == null) {
-incrementRemoved();
-return Long.valueOf(result);
-}
-uc = jspUrl.openConnection();
-if (uc instanceof JarURLConnection) {
-result = ((JarURLConnection) uc).getJarEntry().getTime();
+if (tagJar != null) {
+if (resource.startsWith(/)) {
+resource = resource.substring(1);
+}
+result = tagJar.getLastModified(resource);
} else {
-result = uc.getLastModified();
+URL jspUrl = getResource(resource);
+if (jspUrl == null) {
+incrementRemoved();
+return Long.valueOf(result);
+}
+uc = jspUrl.openConnection();
+if (uc instanceof JarURLConnection) {
+result = ((JarURLConnection) uc).getJarEntry().getTime();
+} else {
+result = uc.getLastModified();
+}
}
} catch (IOException e) {
if (log.isDebugEnabled()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.0-RC7
2013/12/13 Violeta Georgieva miles...@gmail.com Here [1] is the test [1] https://www.dropbox.com/s/3zd106lpqfb3ytv/test.zip Fixed. I didn't add the test yet since I suppose adding a binary should be avoided. Rémy
Re: [VOTE] Release Apache Tomcat 8.0.0-RC7
2013/12/13 Rémy Maucherat r...@apache.org 2013/12/13 Violeta Georgieva miles...@gmail.com Here [1] is the test [1] https://www.dropbox.com/s/3zd106lpqfb3ytv/test.zip Fixed. I didn't add the test yet since I suppose adding a binary should be avoided. Thanks it is working now.
