svn commit: r1597532 - in /tomcat/trunk: java/org/apache/jasper/compiler/Validator.java test/org/apache/jasper/compiler/TestParser.java test/webapp/bug5nnnn/bug56334.jspx test/webapp/bug5nnnn/bug56334
Author: violetagg
Date: Mon May 26 09:00:43 2014
New Revision: 1597532
URL: http://svn.apache.org/r1597532
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56561
Fixed NoSuchElementException when an attribute has empty string as value
Added:
tomcat/trunk/test/webapp/bug5/bug56334and56561.jspx
- copied, changed from r1595808,
tomcat/trunk/test/webapp/bug5/bug56334.jspx
Removed:
tomcat/trunk/test/webapp/bug5/bug56334.jspx
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Validator.java?rev=1597532r1=1597531r2=1597532view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Validator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Validator.java Mon May 26
09:00:43 2014
@@ -1379,8 +1379,12 @@ class Validator {
} else {
// Get text with \$ and \# escaping removed.
// Should be a single Text node
-value = ((ELNode.Text) el.iterator().next())
-.getText();
+IteratorELNode it = el.iterator();
+if (it.hasNext()) {
+value = ((ELNode.Text) it.next()).getText();
+} else {
+value = ;
+}
el = null;
}
}
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java?rev=1597532r1=1597531r2=1597532view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java Mon May 26
09:00:43 2014
@@ -381,7 +381,7 @@ public class TestParser extends TomcatBa
}
@Test
-public void testBug56334() throws Exception {
+public void testBug56334And56561() throws Exception {
Tomcat tomcat = getTomcatInstance();
File appDir = new File(test/webapp);
@@ -399,7 +399,7 @@ public class TestParser extends TomcatBa
tomcat.start();
ByteChunk res = getUrl(http://localhost:; + getPort() +
-/test/bug5/bug56334.jspx);
+/test/bug5/bug56334and56561.jspx);
String result = res.toString();
Copied: tomcat/trunk/test/webapp/bug5/bug56334and56561.jspx (from r1595808,
tomcat/trunk/test/webapp/bug5/bug56334.jspx)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/bug5/bug56334and56561.jspx?p2=tomcat/trunk/test/webapp/bug5/bug56334and56561.jspxp1=tomcat/trunk/test/webapp/bug5/bug56334.jspxr1=1595808r2=1597532rev=1597532view=diff
==
--- tomcat/trunk/test/webapp/bug5/bug56334.jspx (original)
+++ tomcat/trunk/test/webapp/bug5/bug56334and56561.jspx Mon May 26 09:00:43
2014
@@ -33,6 +33,7 @@
set data-value=05a\$\${amp; /
set data-value=05b\$\${amp;${1+1} /
set data-value=05c\#\#{gt;${'hello'}lt; /
+set data-value= /
!-- Test 6: nonTaglibXmlnsAttributes on a Node.UninterpretedTag --
set xmlns:foo=urn:06a\bar\baz /
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1597541 - /tomcat/trunk/webapps/docs/changelog.xml
Author: violetagg Date: Mon May 26 09:37:44 2014 New Revision: 1597541 URL: http://svn.apache.org/r1597541 Log: Update changelog. Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1597541r1=1597540r2=1597541view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon May 26 09:37:44 2014 @@ -124,6 +124,10 @@ bug56543/bug: Update to the Eclipse JDT Compiler 4.4RC1 to pick up some fixes for Java 8 support. (markt/kkolinko) /update + fix +bug56561/bug: Avoid codeNoSuchElementException/code while handling +attributes with empty string value. (violetagg) + /fix /changelog /subsection subsection name=WebSocket - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1597544 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: violetagg Date: Mon May 26 09:59:33 2014 New Revision: 1597544 URL: http://svn.apache.org/r1597544 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=1597544r1=1597543r2=1597544view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon May 26 09:59:33 2014 @@ -27,7 +27,11 @@ None PATCHES PROPOSED TO BACKPORT: [ New proposals should be added at the end of the list ] - +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56561 + Fixed NoSuchElementException when an attribute has empty string as value + http://svn.apache.org/viewvc?view=revisionrevision=1597532 + +1 violetagg + -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
[jira] [Commented] (MTOMCAT-268) warfile for snapshop version grows unlimited since every snapshot jar is included
[
https://issues.apache.org/jira/browse/MTOMCAT-268?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14008708#comment-14008708
]
Wolfgang Fahl commented on MTOMCAT-268:
---
Here is an example of the style of configuration.
I am not sure whether I missed to clean or not. I just found the behaviour
strange and somewhat inacceptable since it creates a lot of network traffic and
bizzarre followup problems.
project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
modelVersion4.0.0/modelVersion
parent
groupIdcom.bitplan.rest/groupId
artifactIdcom.bitplan.rest/artifactId
version0.0.5-SNAPSHOT/version
relativePath../com.bitplan.rest/pom.xml/relativePath
/parent
artifactIdcom.bitplan.acymailing-war/artifactId
packagingwar/packaging
nameacymailing-war/name
descriptionwar packaging of acymailing/description
dependencies
!-- acymailing --
dependency
artifactIdcom.bitplan.acymailing/artifactId
groupId${project.groupId}/groupId
version${project.version}/version
/dependency
/dependencies
build
plugins
!-- tomcat deployment --
plugin
groupIdorg.apache.tomcat.maven/groupId
artifactIdtomcat7-maven-plugin/artifactId
version2.2/version
configuration
server${tomcat.server}/server
urlhttp://${tomcat.server}:${tomcat.port}/manager/text/url
path/acymailing/path
webXmlsrc/main/webapp/WEB-INF/web.xml/webXml
packagingExcludesWEB-INF/lib/javax.servlet-api-3.0.1.jar/packagingExcludes
/configuration
/plugin
/plugins
/build
/project
warfile for snapshop version grows unlimited since every snapshot jar is
included
-
Key: MTOMCAT-268
URL: https://issues.apache.org/jira/browse/MTOMCAT-268
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Affects Versions: 2.2
Reporter: Wolfgang Fahl
For a main jar based project I try creating a war by adding a single
dependency to the pom pointing to the jar file artifact using a snapshot
version.
The created war file contains the jar of the dependency in all available
versions of the snapshot. E.g. instead of having one 50 MByte Jar I get 5 50
MByte Jars added so in principle my war will grow indefinetely with every new
snapshot.
--
This message was sent by Atlassian JIRA
(v6.2#6252)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1597545 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/ test/org/apache/jasper/compiler/ test/webapp-3.0/bug5nnnn/ webapps/docs/
Author: violetagg
Date: Mon May 26 10:00:25 2014
New Revision: 1597545
URL: http://svn.apache.org/r1597545
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56561
Merged revisions 1597532, 1597541 from tomcat/trunk:
Fixed NoSuchElementException when an attribute has empty string as value.
Added:
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug56334and56561.jspx
- copied, changed from r1597541,
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug56334.jspx
Removed:
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug56334.jspx
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1597532,1597541
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java?rev=1597545r1=1597544r2=1597545view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java Mon May
26 10:00:25 2014
@@ -1382,8 +1382,12 @@ class Validator {
} else {
// Get text with \$ and \# escaping removed.
// Should be a single Text node
-value = ((ELNode.Text) el.iterator().next())
-.getText();
+IteratorELNode it = el.iterator();
+if (it.hasNext()) {
+value = ((ELNode.Text) it.next()).getText();
+} else {
+value = ;
+}
el = null;
}
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java?rev=1597545r1=1597544r2=1597545view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java Mon
May 26 10:00:25 2014
@@ -376,7 +376,7 @@ public class TestParser extends TomcatBa
}
@Test
-public void testBug56334() throws Exception {
+public void testBug56334And56561() throws Exception {
Tomcat tomcat = getTomcatInstance();
File appDir = new File(test/webapp-3.0);
@@ -391,7 +391,7 @@ public class TestParser extends TomcatBa
tomcat.start();
ByteChunk res = getUrl(http://localhost:; + getPort() +
-/test/bug5/bug56334.jspx);
+/test/bug5/bug56334and56561.jspx);
String result = res.toString();
Copied: tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug56334and56561.jspx
(from r1597541, tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug56334.jspx)
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug56334and56561.jspx?p2=tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug56334and56561.jspxp1=tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug56334.jspxr1=1597541r2=1597545rev=1597545view=diff
==
--- tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug56334.jspx (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug56334and56561.jspx Mon May
26 10:00:25 2014
@@ -33,8 +33,9 @@
set data-value=05a\$\${amp; /
set data-value=05b\$\${amp;${1+1} /
set data-value=05c\#\#{gt;${'hello'}lt; /
+set data-value= /
!-- Test 6: nonTaglibXmlnsAttributes on a Node.UninterpretedTag --
set xmlns:foo=urn:06a\bar\baz /
-/jsp:root
\ No newline at end of file
+/jsp:root
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=1597545r1=1597544r2=1597545view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon May 26 10:00:25 2014
@@ -81,6 +81,14 @@
/fix
/changelog
/subsection
+ subsection name=Jasper
+changelog
+ fix
+bug56561/bug: Avoid codeNoSuchElementException/code while
handling
+attributes with empty string value. (violetagg)
+ /fix
+/changelog
+ /subsection
/section
section name=Tomcat 7.0.54
[Bug 56565] New: mod_jk 1.2.40 IPv6 support does not work on Windows
https://issues.apache.org/bugzilla/show_bug.cgi?id=56565 Bug ID: 56565 Summary: mod_jk 1.2.40 IPv6 support does not work on Windows Product: Tomcat Connectors Version: 1.2.40 Hardware: PC Status: NEW Severity: major Priority: P2 Component: mod_jk Assignee: dev@tomcat.apache.org Reporter: lf...@redhat.com Created attachment 31662 -- https://issues.apache.org/bugzilla/attachment.cgi?id=31662action=edit mod_jk.log mod_jk 1.2.40 IPv6 support does not work on Windows. mod_jk IPv6 support on RHEL and Solaris work well. see attched mod_jk.log -- 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 56561] NoSuchElementException on empty attribute in Validator$ValidateVisitor.getJspAttribute(Validator.java:1385)
https://issues.apache.org/bugzilla/show_bug.cgi?id=56561 Violeta Georgieva violet...@apache.org changed: What|Removed |Added Component|Jasper |Jasper Version|7.0.54 |6.0.41 Product|Tomcat 7|Tomcat 6 Target Milestone|--- |default --- Comment #1 from Violeta Georgieva violet...@apache.org --- Thanks for the report. This has been fixed in trunk for 8.0.9 and in 7.0.x for 7.0.55 onwards. The fix is proposed for Tomcat 6. -- 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 56565] mod_jk 1.2.40 IPv6 support does not work on Windows
https://issues.apache.org/bugzilla/show_bug.cgi?id=56565 lf...@redhat.com changed: What|Removed |Added OS||Windows Server 2008 -- 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 Buildbot configuration - JIRA issue
Hi! I filed the issue for our Buildbot configuration: https://issues.apache.org/jira/browse/INFRA-7807 You may want to keep a watch on it or add a comment. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1597572 - /tomcat/trunk/
Author: kkolinko Date: Mon May 26 12:11:10 2014 New Revision: 1597572 URL: http://svn.apache.org/r1597572 Log: Set bugtraq:logregex property on the root directory. This allows TortoiseSVN to parse arbitrary references to Bugzilla issues in addition to those that follow Fix ... template. Just the issue URL or BZ + number is enough. Modified: tomcat/trunk/ (props changed) Propchange: tomcat/trunk/ -- --- bugtraq:logregex (added) +++ bugtraq:logregex Mon May 26 12:11:10 2014 @@ -0,0 +1,2 @@ +(https?\://issues.apache.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+) +(\d+) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat Buildbot configuration - JIRA issue
Hi Konstantin, On Mon, May 26, 2014 at 2:59 PM, Konstantin Kolinko knst.koli...@gmail.comwrote: Hi! I filed the issue for our Buildbot configuration: https://issues.apache.org/jira/browse/INFRA-7807 You may want to keep a watch on it or add a comment. Best regards, Konstantin Kolinko I don't remember whether I have asked INFRA for commit rights or I have them because I am a committer at Wicket project but I can edit https://svn.apache.org/repos/infra/infrastructure/buildbot/aegis/buildmaster/master1/projects/wicket.conf . The BuildBot job is restarted/recreated at most 5 mins after a commit. If there are any errors in the new configuration then the old one is still used and the errors are mailed to the commit author so you can fix them. All I'm saying is that you can fix all the issues yourself if you know BuildBot's DSL. Otherwise Gavin is your contact at INFRA for BuildBot stuff. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1597573 - in /tomcat/trunk/test: org/apache/jasper/compiler/TestParser.java webapp/bug5nnnn/bug56334and56561.jspx
Author: kkolinko
Date: Mon May 26 12:24:57 2014
New Revision: 1597573
URL: http://svn.apache.org/r1597573
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=56561
Followup to r1597532: check the output of the new test.
Modified:
tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
tomcat/trunk/test/webapp/bug5/bug56334and56561.jspx
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java?rev=1597573r1=1597572r2=1597573view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java Mon May 26
12:24:57 2014
@@ -415,6 +415,7 @@ public class TestParser extends TomcatBa
Assert.assertTrue(result, result.contains(set
data-value=\05a$${amp;\/));
Assert.assertTrue(result, result.contains(set
data-value=\05b$${amp;2\/));
Assert.assertTrue(result, result.contains(set
data-value=\05c##{gt;hellolt;\/));
+Assert.assertTrue(result, result.contains(05x:set
data-value=\\/));
Assert.assertTrue(result, result.contains(set
xmlns:foo=\urn:06a\\bar\\baz\/));
}
Modified: tomcat/trunk/test/webapp/bug5/bug56334and56561.jspx
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/bug5/bug56334and56561.jspx?rev=1597573r1=1597572r2=1597573view=diff
==
--- tomcat/trunk/test/webapp/bug5/bug56334and56561.jspx (original)
+++ tomcat/trunk/test/webapp/bug5/bug56334and56561.jspx Mon May 26 12:24:57
2014
@@ -33,7 +33,8 @@
set data-value=05a\$\${amp; /
set data-value=05b\$\${amp;${1+1} /
set data-value=05c\#\#{gt;${'hello'}lt; /
-set data-value= /
+!-- Test for BZ 56561 --
+05x:set data-value= /
!-- Test 6: nonTaglibXmlnsAttributes on a Node.UninterpretedTag --
set xmlns:foo=urn:06a\bar\baz /
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat Buildbot configuration - JIRA issue
2014-05-26 16:13 GMT+04:00 Martin Grigorov mgrigo...@apache.org: Hi Konstantin, On Mon, May 26, 2014 at 2:59 PM, Konstantin Kolinko knst.koli...@gmail.comwrote: Hi! I filed the issue for our Buildbot configuration: https://issues.apache.org/jira/browse/INFRA-7807 You may want to keep a watch on it or add a comment. Best regards, Konstantin Kolinko I don't remember whether I have asked INFRA for commit rights or I have them because I am a committer at Wicket project but I can edit https://svn.apache.org/repos/infra/infrastructure/buildbot/aegis/buildmaster/master1/projects/wicket.conf . The BuildBot job is restarted/recreated at most 5 mins after a commit. If there are any errors in the new configuration then the old one is still used and the errors are mailed to the commit author so you can fix them. All I'm saying is that you can fix all the issues yourself if you know BuildBot's DSL. Otherwise Gavin is your contact at INFRA for BuildBot stuff. Thank you for the link! I do not know whether I can write there, but at least I can read those files. It is helpful. In any way, I would need help from infrastructure team to cleanup the files that are at wrong places at buildbot master, and for crontab configuration (if there was any). Best regards, Konstantin Kolinko - 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/108 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1597532 Blamelist: violetagg BUILD FAILED: failed compile_1 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Git (again)
2014-05-24 0:51 GMT+04:00 Sylvain Laurent slaur...@apache.org: Hello, Back in january/february there was a thread on moving to git with many +1 for it. Are there any concrete plans for this ? I'm looking forward to it as using SVN from Europe is so slow... or maybe I'm now too accustomed to git's speed ;-) I was wondering what the workflow would be for tomcat development with git : currently some commits are made on trunk, then potentially selectively merged to tomcat 7 then 6. With git, how would it look like ? cherry picks ? that's not very in the spirit of git. Or fixes on tomcat 6 or 7 and then merge to 8 ? In that case tomcat 8 would be branch master and tomcat 6 and 7 would be on their own branch and merges would look like 6 - 7 - master ? I'm quite used to such a workflow for enterprise app dev where we add features to master, very rarely to the old/stable version... but this is actually not the case with tomcat... I think we can be friendly to git mirrors with our svn configuration, but I am that that we cannot move Tomcat to git now. My technical reasons: 1. There is svn externals reference from Tomcat Native to Tomcat Trunk. 2. svn revision numbers are used on the config difference form in the migration guide. 3. The plan to create a Maven build (BZ 56397) relies on svn externals. My subjective reasons: 4. I do not believe that git will be faster. - For Subversion there is mirror in Europe and svn up runs considerably fast. For Git at Apache I think there is only one server in USA, so I expect it to be slower. - Subversion Commit is expected to be slower, because it has to go to US server (via write-through proxy in Europe) and it has to trigger post-commit hooks. - With Subversion I have a single working copy that spans all 3 active branches which I can update at once. Is there a way to configure Git locally in the same way? Do I miss something? My understanding that with Git I need to have several local repositories, because working copy is tied to a repository instance (the .git subdirectory). Even with configuration that Mark proposed (all branches in the same repository), I would have several local copies of that repository. 5. I think Subversion is a lover entrance barrier than Git. As of now, we support both systems. - Subversion checkouts take less disk space. - Subversion configuration on Windows platform is easier. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Git (again)
Hi, On Mon, May 26, 2014 at 4:18 PM, Konstantin Kolinko knst.koli...@gmail.comwrote: 2014-05-24 0:51 GMT+04:00 Sylvain Laurent slaur...@apache.org: Hello, Back in january/february there was a thread on moving to git with many +1 for it. Are there any concrete plans for this ? I'm looking forward to it as using SVN from Europe is so slow... or maybe I'm now too accustomed to git's speed ;-) I was wondering what the workflow would be for tomcat development with git : currently some commits are made on trunk, then potentially selectively merged to tomcat 7 then 6. With git, how would it look like ? cherry picks ? that's not very in the spirit of git. Or fixes on tomcat 6 or 7 and then merge to 8 ? In that case tomcat 8 would be branch master and tomcat 6 and 7 would be on their own branch and merges would look like 6 - 7 - master ? I'm quite used to such a workflow for enterprise app dev where we add features to master, very rarely to the old/stable version... but this is actually not the case with tomcat... I think we can be friendly to git mirrors with our svn configuration, but I am that that we cannot move Tomcat to git now. My technical reasons: 1. There is svn externals reference from Tomcat Native to Tomcat Trunk. I am not expert in neither SVN externals nor in Git submodules but I think this should be OK with Git submodules assuming that both Tomcat and Tomcat Native are Git repos. See http://git-scm.com/book/en/Git-Tools-Submodules 2. svn revision numbers are used on the config difference form in the migration guide. I guess this may become Git commit ids after the migration. 3. The plan to create a Maven build (BZ 56397) relies on svn externals. My subjective reasons: 4. I do not believe that git will be faster. - For Subversion there is mirror in Europe and svn up runs considerably fast. For Git at Apache I think there is only one server in USA, so I expect it to be slower. My experience is the opposite. I live in Bulgaria and when Wicket used SVN even the EU mirror was very slow for me. With Git (US server!) it is definitely better. - Subversion Commit is expected to be slower, because it has to go to US server (via write-through proxy in Europe) and it has to trigger post-commit hooks. - With Subversion I have a single working copy that spans all 3 active branches which I can update at once. With Git this is possible too. I use git-new-workdir for that. See http://thejspr.com/blog/work-on-multiple-branches-with-git-workdir/ So I have three different folders on my file system - one for wicket-1.5.x branch, one for wicket-6.x and one for wicket-7.x (master) that all share the same .git/ folder. So git fetch updates all of them in one step. Is there a way to configure Git locally in the same way? Do I miss something? My understanding that with Git I need to have several local repositories, because working copy is tied to a repository instance (the .git subdirectory). Even with configuration that Mark proposed (all branches in the same repository), I would have several local copies of that repository. 5. I think Subversion is a lover entrance barrier than Git. As of now, s/lover/lower/ ;) Yes, SVN is simpler. we support both systems. - Subversion checkouts take less disk space. - Subversion configuration on Windows platform is easier. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1597581 - /tomcat/tc7.0.x/trunk/
Author: kkolinko Date: Mon May 26 13:36:24 2014 New Revision: 1597581 URL: http://svn.apache.org/r1597581 Log: Set bugtraq:logregex property on the root directory. This allows TortoiseSVN to parse arbitrary references to Bugzilla issues in addition to those that follow Fix ... template. Just the issue URL or BZ + number is enough. It is merge of r1597572 from tomcat/trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) Propchange: tomcat/tc7.0.x/trunk/ -- --- bugtraq:logregex (added) +++ bugtraq:logregex Mon May 26 13:36:24 2014 @@ -0,0 +1,2 @@ +(https?\://issues.apache.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+) +(\d+) Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1597572 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1597583 - in /tomcat/trunk: java/org/apache/jasper/servlet/JasperInitializer.java webapps/docs/changelog.xml
Author: markt
Date: Mon May 26 13:42:41 2014
New Revision: 1597583
URL: http://svn.apache.org/r1597583
Log:
Fix a TODO
Only set the JspFactory if not already set
Modified:
tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java?rev=1597583r1=1597582r2=1597583view=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java Mon May
26 13:42:41 2014
@@ -68,8 +68,9 @@ public class JasperInitializer implement
}
}
-// TODO we should play nice and only set this if it's null
-JspFactory.setDefaultFactory(factory);
+if (JspFactory.getDefaultFactory() == null) {
+JspFactory.setDefaultFactory(factory);
+}
}
@Override
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1597583r1=1597582r2=1597583view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon May 26 13:42:41 2014
@@ -128,6 +128,11 @@
bug56561/bug: Avoid codeNoSuchElementException/code while
handling
attributes with empty string value. (violetagg)
/fix
+ scode
+Do not configure a codeJspFactory/code in the
+codeJasperInitializer/code if one has already been set as might be
+the case in some embedding scenarios. (markt)
+ /scode
/changelog
/subsection
subsection name=WebSocket
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1597584 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Mon May 26 13:43:16 2014 New Revision: 1597584 URL: http://svn.apache.org/r1597584 Log: Keep change log to max 80 chars wide Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1597584r1=1597583r2=1597584view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon May 26 13:43:16 2014 @@ -125,8 +125,8 @@ some fixes for Java 8 support. (markt/kkolinko) /update fix -bug56561/bug: Avoid codeNoSuchElementException/code while handling -attributes with empty string value. (violetagg) +bug56561/bug: Avoid codeNoSuchElementException/code while +handling attributes with empty string value. (violetagg) /fix scode Do not configure a codeJspFactory/code in the - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1597587 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/jasper/compiler/TestParser.java test/webapp-3.0/bug5nnnn/bug56334and56561.jspx
Author: kkolinko
Date: Mon May 26 13:57:55 2014
New Revision: 1597587
URL: http://svn.apache.org/r1597587
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=56561
Followup to r1597532: check the output of the new test.
It is backport of r1597573 from tomcat/trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug56334and56561.jspx
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1597573
Modified: tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java?rev=1597587r1=1597586r2=1597587view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java Mon
May 26 13:57:55 2014
@@ -407,6 +407,7 @@ public class TestParser extends TomcatBa
Assert.assertTrue(result, result.contains(set
data-value=\05a$${amp;\/));
Assert.assertTrue(result, result.contains(set
data-value=\05b$${amp;2\/));
Assert.assertTrue(result, result.contains(set
data-value=\05c##{gt;hellolt;\/));
+Assert.assertTrue(result, result.contains(05x:set
data-value=\\/));
Assert.assertTrue(result, result.contains(set
xmlns:foo=\urn:06a\\bar\\baz\/));
}
Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug56334and56561.jspx
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug56334and56561.jspx?rev=1597587r1=1597586r2=1597587view=diff
==
--- tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug56334and56561.jspx
(original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug56334and56561.jspx Mon May
26 13:57:55 2014
@@ -33,7 +33,8 @@
set data-value=05a\$\${amp; /
set data-value=05b\$\${amp;${1+1} /
set data-value=05c\#\#{gt;${'hello'}lt; /
-set data-value= /
+!-- Test for BZ 56561 --
+05x:set data-value= /
!-- Test 6: nonTaglibXmlnsAttributes on a Node.UninterpretedTag --
set xmlns:foo=urn:06a\bar\baz /
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1597588 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Mon May 26 13:58:55 2014 New Revision: 1597588 URL: http://svn.apache.org/r1597588 Log: vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1597588r1=1597587r2=1597588view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon May 26 13:58:55 2014 @@ -30,7 +30,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56561 Fixed NoSuchElementException when an attribute has empty string as value http://svn.apache.org/viewvc?view=revisionrevision=1597532 - +1 violetagg + +1 violetagg, kkolinko -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
svn commit: r1597592 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/security/SecurityClassLoad.java webapps/docs/changelog.xml
Author: kkolinko
Date: Mon May 26 14:14:18 2014
New Revision: 1597592
URL: http://svn.apache.org/r1597592
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56545
Pre-load an additional class if running under a security manager
It is merge of r1596141 from tomcat/trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1596141
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1597592r1=1597591r2=1597592view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Mon May 26 14:14:18 2014
@@ -272,6 +272,7 @@ public final class SecurityClassLoad {
clazz.newInstance();
loader.loadClass(basePackage + util.http.HttpMessages);
loader.loadClass(basePackage + util.http.parser.HttpParser);
+loader.loadClass(basePackage +
util.http.parser.HttpParser$SkipConstantResult);
loader.loadClass(basePackage + util.http.parser.MediaType);
loader.loadClass(basePackage + util.http.parser.MediaTypeCache);
// net
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=1597592r1=1597591r2=1597592view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon May 26 14:14:18 2014
@@ -68,6 +68,11 @@
optionally interrupt stuck threads to attempt to unblock them.
(slaurent)
/add
+ fix
+bug56545/bug: Pre-load an additional class, the loading of which
+may otherwise be triggered by a web application which in turn would
+trigger an exception when running under a security manager. (kkolinko)
+ /fix
/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56545] Examples app security exceptions
https://issues.apache.org/bugzilla/show_bug.cgi?id=56545 Konstantin Kolinko knst.koli...@gmail.com changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #8 from Konstantin Kolinko knst.koli...@gmail.com --- Fixed in Tomcat 7 by r1597592 and will be in 7.0.55. I did not backport r1596201. -- 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 56560] Jasper ant task fails with java.lang.NoClassDefFoundError: org.apache.tomcat.util.descriptor.LocalResolver
https://issues.apache.org/bugzilla/show_bug.cgi?id=56560 Konstantin Kolinko knst.koli...@gmail.com changed: What|Removed |Added Attachment #31659|0 |1 is patch|| --- Comment #1 from Konstantin Kolinko knst.koli...@gmail.com --- Comment on attachment 31659 -- https://issues.apache.org/bugzilla/attachment.cgi?id=31659 patch for catalina-tasks.xml I wonder why catalina-tasks.xml lists individual jar files. It would be easier to just include all *.jar files into the classpath. -- 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: r1597597 - in /tomcat/trunk: java/org/apache/jasper/servlet/JasperInitializer.java java/org/apache/tomcat/SimpleInstanceManager.java webapps/docs/changelog.xml
Author: markt
Date: Mon May 26 14:46:22 2014
New Revision: 1597597
URL: http://svn.apache.org/r1597597
Log:
Implement first part of pull request from Greg Wilkins to make Jasper more
independent from Tomcat.
Added:
tomcat/trunk/java/org/apache/tomcat/SimpleInstanceManager.java (with
props)
Modified:
tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java?rev=1597597r1=1597596r2=1597597view=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java Mon May
26 14:46:22 2014
@@ -31,6 +31,8 @@ import org.apache.jasper.runtime.JspFact
import org.apache.jasper.security.SecurityClassLoad;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.InstanceManager;
+import org.apache.tomcat.SimpleInstanceManager;
import org.xml.sax.SAXException;
/**
@@ -79,6 +81,11 @@ public class JasperInitializer implement
log.debug(Localizer.getMessage(MSG + .onStartup,
context.getServletContextName()));
}
+// Setup a simple default Instance Manager
+if (context.getAttribute(InstanceManager.class.getName())==null) {
+context.setAttribute(InstanceManager.class.getName(), new
SimpleInstanceManager());
+}
+
boolean validate = Boolean.parseBoolean(
context.getInitParameter(Constants.XML_VALIDATION_TLD_INIT_PARAM));
String blockExternalString = context.getInitParameter(
Added: tomcat/trunk/java/org/apache/tomcat/SimpleInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/SimpleInstanceManager.java?rev=1597597view=auto
==
--- tomcat/trunk/java/org/apache/tomcat/SimpleInstanceManager.java (added)
+++ tomcat/trunk/java/org/apache/tomcat/SimpleInstanceManager.java Mon May 26
14:46:22 2014
@@ -0,0 +1,68 @@
+/*
+ * 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.tomcat;
+
+import java.lang.reflect.InvocationTargetException;
+
+import javax.naming.NamingException;
+
+/**
+ * SimpleInstanceManager
+ *
+ * Implement the org.apache.tomcat.InstanceManager interface.
+ */
+public class SimpleInstanceManager implements InstanceManager {
+
+public SimpleInstanceManager() {
+}
+
+@Override
+public Object newInstance(Class? clazz) throws IllegalAccessException,
+InvocationTargetException, NamingException, InstantiationException
{
+return prepareInstance(clazz.newInstance());
+}
+
+@Override
+public Object newInstance(String className) throws IllegalAccessException,
+InvocationTargetException, NamingException, InstantiationException,
+ClassNotFoundException {
+Class? clazz =
Thread.currentThread().getContextClassLoader().loadClass(className);
+return prepareInstance(clazz.newInstance());
+}
+
+@Override
+public Object newInstance(String fqcn, ClassLoader classLoader) throws
IllegalAccessException,
+InvocationTargetException, NamingException, InstantiationException,
+ClassNotFoundException {
+Class? clazz = classLoader.loadClass(fqcn);
+return prepareInstance(clazz.newInstance());
+}
+
+@Override
+public void newInstance(Object o) throws IllegalAccessException,
InvocationTargetException,
+NamingException {
+prepareInstance(o);
+}
+
+@Override
+public void destroyInstance(Object o) throws IllegalAccessException,
InvocationTargetException {
+}
+
+private Object prepareInstance(Object o) {
+return o;
+}
+}
\ No newline at end of file
Propchange: tomcat/trunk/java/org/apache/tomcat/SimpleInstanceManager.java
--
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/83 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1597581 Blamelist: kkolinko BUILD FAILED: failed compile_1 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1597602 - in /tomcat/trunk: java/org/apache/juli/logging/LogFactory.java webapps/docs/changelog.xml
Author: markt
Date: Mon May 26 15:16:45 2014
New Revision: 1597602
URL: http://svn.apache.org/r1597602
Log:
Implement second part of pull request from Greg Wilkins to make Jasper more
independent from Tomcat.
Add ServiceLoader based discovery support to the JULI LogFactory
Modified:
tomcat/trunk/java/org/apache/juli/logging/LogFactory.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/juli/logging/LogFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/logging/LogFactory.java?rev=1597602r1=1597601r2=1597602view=diff
==
--- tomcat/trunk/java/org/apache/juli/logging/LogFactory.java (original)
+++ tomcat/trunk/java/org/apache/juli/logging/LogFactory.java Mon May 26
15:16:45 2014
@@ -16,33 +16,34 @@
*/
package org.apache.juli.logging;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ServiceLoader;
import java.util.logging.LogManager;
/**
- * Modified LogFactory: removed all discovery, hardcode a specific
implementation
- * If you like a different logging implementation - use either the
discovery-based
- * commons-logging, or better - another implementation hardcoded to your
favourite
- * logging impl.
- *
- * Why ? Each application and deployment can choose a logging implementation -
- * that involves configuration, installing the logger jar and optional
plugins, etc.
- * As part of this process - they can as well install the commons-logging
implementation
- * that corresponds to their logger of choice. This completely avoids any
discovery
- * problem, while still allowing the user to switch.
- *
- * Note that this implementation is not just a wrapper around JDK logging (
like
- * the original commons-logging impl ). It adds 2 features - a simpler
configuration
- * ( which is in fact a subset of log4j.properties ) and a formatter that is
- * less ugly.
- *
- * The removal of 'abstract' preserves binary backward compatibility. It is
possible
- * to preserve the abstract - and introduce another ( hardcoded ) factory -
but I
- * see no benefit.
- *
- * Since this class is not intended to be extended - and provides
- * no plugin for other LogFactory implementation - all protected methods are
removed.
- * This can be changed - but again, there is little value in keeping dead code.
- * Just take a quick look at the removed code ( and it's complexity)
+ * This is a modified LogFactory that uses a simple {@link ServiceLoader} based
+ * discovery mechanism with a default of using JDK based logging. An
+ * implementation that uses the full Commons Logging discovery mechanism is
+ * available as part of the Tomcat extras download.
+ *
+ * Why? It is an attempt to strike a balance between simpler code (no
discovery)
+ * and providing flexibility - particularly for those projects that embed
Tomcat
+ * or some of Tomcatapos;s components - is an alternative logging
+ * implementationnis desired.
+ *
+ * Note that this implementation is not just a wrapper around JDK logging (like
+ * the original commons-logging impl). It adds 2 features - a simpler
+ * configuration (which is in fact a subset of log4j.properties) and a
+ * formatter that is less ugly.
+ *
+ * The removal of 'abstract' preserves binary backward compatibility. It is
+ * possible to preserve the abstract - and introduce another (hardcoded)
factory
+ * - but I see no benefit.
+ *
+ * Since this class is not intended to be extended - all protected methods are
+ * removed. This can be changed - but again, there is little value in keeping
+ * dead code. Just take a quick look at the removed code ( and it's
complexity).
*
* --
*
@@ -64,11 +65,26 @@ public class LogFactory {
private static final LogFactory singleton = new LogFactory();
+private final Constructor? extends Log discoveredLogConstructor;
/**
- * Protected constructor that is not available for public use.
+ * Private constructor that is not available for public use.
*/
private LogFactory() {
+// Look via a ServiceLoader for a Log implementation that has a
+// constructor taking the String name.
+ServiceLoaderLog logLoader = ServiceLoader.load(Log.class);
+Constructor? extends Log m=null;
+for (Log log: logLoader) {
+Class? extends Log c=log.getClass();
+try {
+m=c.getConstructor(String.class);
+}
+catch (NoSuchMethodException | SecurityException e) {
+throw new Error(e);
+}
+}
+discoveredLogConstructor=m;
}
@@ -93,9 +109,17 @@ public class LogFactory {
* @exception LogConfigurationException if a suitable codeLog/code
* instance cannot be returned
*/
-public Log getInstance(String name)
-throws LogConfigurationException {
-
[GitHub] tomcat pull request: Changes to make Jasper more separable from To...
Github user asfgit closed the pull request at: https://github.com/apache/tomcat/pull/4 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1597617 - in /tomcat/trunk/java/org/apache/jasper/servlet: JasperInitializer.java TldPreScanned.java TldScanner.java
Author: markt
Date: Mon May 26 17:52:57 2014
New Revision: 1597617
URL: http://svn.apache.org/r1597617
Log:
Implement third part of pull request from Greg Wilkins to make Jasper more
independent from Tomcat.
Add support for using an existing list of TLDs rather than scanning for them
This closes #4
Added:
tomcat/trunk/java/org/apache/jasper/servlet/TldPreScanned.java (with
props)
Modified:
tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java?rev=1597617r1=1597616r2=1597617view=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java Mon May
26 17:52:57 2014
@@ -98,7 +98,7 @@ public class JasperInitializer implement
}
// scan the application for TLDs
-TldScanner scanner = new TldScanner(context, true, validate,
blockExternal);
+TldScanner scanner = newTldScanner(context, true, validate,
blockExternal);
try {
scanner.scan();
} catch (IOException | SAXException e) {
@@ -114,4 +114,9 @@ public class JasperInitializer implement
new TldCache(context, scanner.getUriTldResourcePathMap(),
scanner.getTldResourcePathTaglibXmlMap()));
}
+
+protected TldScanner newTldScanner(ServletContext context, boolean
namespaceAware,
+boolean validate, boolean blockExternal) {
+return new TldScanner(context, namespaceAware, validate,
blockExternal);
+}
}
Added: tomcat/trunk/java/org/apache/jasper/servlet/TldPreScanned.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/TldPreScanned.java?rev=1597617view=auto
==
--- tomcat/trunk/java/org/apache/jasper/servlet/TldPreScanned.java (added)
+++ tomcat/trunk/java/org/apache/jasper/servlet/TldPreScanned.java Mon May 26
17:52:57 2014
@@ -0,0 +1,55 @@
+/*
+ * 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.servlet;
+
+import java.net.URL;
+import java.util.Collection;
+
+import javax.servlet.ServletContext;
+
+import org.apache.tomcat.util.descriptor.tld.TldResourcePath;
+
+public class TldPreScanned extends TldScanner {
+
+private final CollectionURL preScannedURLs;
+
+public TldPreScanned (ServletContext context, boolean namespaceAware,
boolean validation,
+boolean blockExternal, CollectionURL preScannedTlds) {
+super(context, namespaceAware, validation, blockExternal);
+preScannedURLs = preScannedTlds;
+}
+
+@Override
+public void scanJars() {
+for (URL url : preScannedURLs){
+String str = url.toExternalForm();
+int a = str.indexOf(jar:);
+int b = str.indexOf(!/);
+if (a = 0 b 0) {
+String fileUrl = str.substring(a + 4, b);
+String path = str.substring(b + 2);
+try {
+parseTld(new TldResourcePath(new URL(fileUrl), null,
path));
+} catch (Exception e) {
+throw new IllegalStateException(e);
+}
+} else {
+throw new IllegalStateException(Bad tld url: +str);
+}
+}
+}
+}
\ No newline at end of file
Propchange: tomcat/trunk/java/org/apache/jasper/servlet/TldPreScanned.java
--
svn:eol-style = native
Modified: tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java?rev=1597617r1=1597616r2=1597617view=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java (original)
+++
Re: [GitHub] tomcat pull request: Changes to make Jasper more separable from To...
On 26/05/2014 18:53, asfgit wrote: Github user asfgit closed the pull request at: https://github.com/apache/tomcat/pull/4 --- Greg, This should be all the changes you requested - or something very close to them anyway. Let us know if I missed something or messed something up. The changes will be in 8.0.9 onwards. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55988] Add parameter useCipherSuitesOrder to JSSE (BIO and NIO) connectors [PATCH]
https://issues.apache.org/bugzilla/show_bug.cgi?id=55988 --- Comment #11 from Christopher Schultz ch...@christopherschultz.net --- Ognjen, I have a couple of further comments about your proposed patch. I'm leaning towards adding this to Tomcat 8 but not back-porting unless there is significant demand. 1. Most of the 2 configureUseCipherSuitesOrder methods is the same. Consider re-factoring the bulk of that method into a superclass utility method and then extract the SSLParameters object from either SSLEngine or Socket in the subclasses. 2. Since this is a security-related configuration, consider failing totally when server-side ordering is requested but can't be enforced -- e.g. the reflection fails for any reason. You have it logging a warning but continuing which I think isn't appropriate in this case. -- 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 55988] Add parameter useCipherSuitesOrder to JSSE (BIO and NIO) connectors [PATCH]
https://issues.apache.org/bugzilla/show_bug.cgi?id=55988 --- Comment #12 from Christopher Schultz ch...@christopherschultz.net --- (In reply to Ognjen Blagojevic from comment #4) No objections. Do I need to provide a new patch with the name you proposed? If you like my suggestions above, you could make all 3 changes at once and propose a new patch. That would be nice ;) -- 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 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/110 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1597602 Blamelist: markt Build succeeded! sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1597649 - in /tomcat/trunk: java/org/apache/coyote/http11/filters/VoidInputFilter.java webapps/docs/changelog.xml
Author: markt
Date: Mon May 26 21:09:46 2014
New Revision: 1597649
URL: http://svn.apache.org/r1597649
Log:
Simplify available() and isFinished() as current implementation broke Comet
chat example.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java?rev=1597649r1=1597648r2=1597649view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java Mon
May 26 21:09:46 2014
@@ -47,12 +47,6 @@ public class VoidInputFilter implements
}
-// - Instance Variables
-
-// Tracks if an attempt has been made to read data
-private boolean read = false;
-
-
// InputBuffer Methods
/**
@@ -62,7 +56,6 @@ public class VoidInputFilter implements
*/
@Override
public int doRead(ByteChunk chunk, Request req) throws IOException {
-read = true;
return -1;
}
@@ -92,7 +85,7 @@ public class VoidInputFilter implements
*/
@Override
public void recycle() {
-read = false;
+// NOOP
}
@@ -123,16 +116,12 @@ public class VoidInputFilter implements
@Override
public int available() {
-if (read) {
-return 0;
-} else {
-return 1;
-}
+return 0;
}
@Override
public boolean isFinished() {
-return read;
+return true;
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1597649r1=1597648r2=1597649view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon May 26 21:09:46 2014
@@ -122,6 +122,10 @@
buffer when the buffer is only partially written on a subsequent write.
(markt)
/fix
+ fix
+Ensure that a request without a body is correctly handled during Comet
+processing. This fixes the Comet chat example. (markt)
+ /fix
/changelog
/subsection
subsection name=Jasper
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56551] Increase timeouts in CometChat example
https://issues.apache.org/bugzilla/show_bug.cgi?id=56551 Mark Thomas ma...@apache.org changed: What|Removed |Added OS||All Severity|minor |enhancement --- Comment #1 from Mark Thomas ma...@apache.org --- Moving to an enhancement now I have fixed the underlying bug that broke the chat example. It isn't clear at this point that there is a problem here that needs fixing. -- 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: r1597652 - in /tomcat/trunk: java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java webapps/docs/changelog.xml
Author: markt
Date: Mon May 26 22:03:54 2014
New Revision: 1597652
URL: http://svn.apache.org/r1597652
Log:
ISE is expected when using AsyncChannels. Handle it the same way an IOException
is handled rather than expecting the client code to catch and handle it.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java?rev=1597652r1=1597651r2=1597652view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java
Mon May 26 22:03:54 2014
@@ -45,8 +45,12 @@ public class WsRemoteEndpointImplClient
}
SendHandlerToCompletionHandler sh2ch =
new SendHandlerToCompletionHandler(handler);
-channel.write(data, 0, data.length, timeout, TimeUnit.MILLISECONDS,
-null, sh2ch);
+try {
+channel.write(data, 0, data.length, timeout, TimeUnit.MILLISECONDS,
+null, sh2ch);
+} catch (IllegalStateException ise) {
+sh2ch.failed(ise, null);
+}
}
@Override
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1597652r1=1597651r2=1597652view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon May 26 22:03:54 2014
@@ -158,6 +158,11 @@
on a POJO based WebSocket endpoint. Based on a suggestion by Eugene
Chung. (markt)
/scode
+ fix
+When a WebSocket client attempts to write to a closed connection,
handle
+the resulting codeIllegalStateException/code in a manner consistent
+with the handling of an codeIOException/code. (markt)
+ /fix
/changelog
/subsection
subsection name=Other
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56546] Improve thread trace logging in WebappClassLoader.clearReferencesThreads()
https://issues.apache.org/bugzilla/show_bug.cgi?id=56546 --- Comment #4 from Mark Thomas ma...@apache.org --- org.apache.tomcat.websocket.TestWsWebSocketContainer no longer generates this message. -- 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: r1597662 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Author: markt
Date: Mon May 26 22:54:20 2014
New Revision: 1597662
URL: http://svn.apache.org/r1597662
Log:
Refactor test to enable a clean server shutdown. This prevents the web
application class loader complaining about a still running thread on server
stop.
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1597662r1=1597661r2=1597662view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Mon May 26 22:54:20 2014
@@ -361,6 +361,9 @@ public class TestWsWebSocketContainer ex
long timeout = System.currentTimeMillis() - lastSend;
+// Clear the server side block and prevent and further blocks to allow
+// the server to shutdown cleanly
+BlockingPojo.clearBlock();
String msg = Time out was [ + timeout + ] ms;
@@ -462,6 +465,8 @@ public class TestWsWebSocketContainer ex
(ServerContainer) sce.getServletContext().getAttribute(
Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
try {
+// Reset blocking state
+BlockingPojo.resetBlock();
sc.addEndpoint(BlockingPojo.class);
} catch (DeploymentException e) {
throw new IllegalStateException(e);
@@ -472,11 +477,35 @@ public class TestWsWebSocketContainer ex
@ServerEndpoint(/block)
public static class BlockingPojo {
+
+private static Object monitor = new Object();
+// Enable blockign by default
+private static boolean block = true;
+
+/**
+ * Clear any current block.
+ */
+public static void clearBlock() {
+synchronized (monitor) {
+BlockingPojo.block = false;
+monitor.notifyAll();
+}
+}
+
+public static void resetBlock() {
+synchronized (monitor) {
+block = true;
+}
+}
@SuppressWarnings(unused)
@OnMessage
public void echoTextMessage(Session session, String msg, boolean last)
{
try {
-Thread.sleep(6);
+synchronized (monitor) {
+while (block) {
+monitor.wait();
+}
+}
} catch (InterruptedException e) {
// Ignore
}
@@ -488,7 +517,11 @@ public class TestWsWebSocketContainer ex
public void echoBinaryMessage(Session session, ByteBuffer msg,
boolean last) {
try {
-Thread.sleep(TIMEOUT_MS * 10);
+synchronized (monitor) {
+while (block) {
+monitor.wait();
+}
+}
} catch (InterruptedException e) {
// Ignore
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1597671 - /tomcat/maven-plugin/trunk/pom.xml
Author: olamy Date: Tue May 27 00:04:03 2014 New Revision: 1597671 URL: http://svn.apache.org/r1597671 Log: tomcat 7.0.54 Modified: tomcat/maven-plugin/trunk/pom.xml Modified: tomcat/maven-plugin/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1597671r1=1597670r2=1597671view=diff == --- tomcat/maven-plugin/trunk/pom.xml (original) +++ tomcat/maven-plugin/trunk/pom.xml Tue May 27 00:04:03 2014 @@ -73,7 +73,7 @@ its.ajp.port2001/its.ajp.port !-- server port for it tests -- its.server.port2008/its.server.port -tomcat7Version7.0.53/tomcat7Version +tomcat7Version7.0.54/tomcat7Version !-- to prevent isssues with last apache parent pom -- arguments / - 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/112 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1597652 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
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/113 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1597662 Blamelist: markt Build succeeded! sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56561] NoSuchElementException on empty attribute in Validator$ValidateVisitor.getJspAttribute(Validator.java:1385)
https://issues.apache.org/bugzilla/show_bug.cgi?id=56561 --- Comment #2 from Alex Panchenko alex.panche...@gmail.com --- Thanks for applying a fix. Would it make sense to revoke the recent releases and make a new ones with the fix soon? -- 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
