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/5677 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1586916 Blamelist: markt Build succeeded! sincerely, -The Buildbot
[Bug 56406] New: VirtualDirContext.setExtraResourcePaths incorrect separator in example semicolon instead comma
https://issues.apache.org/bugzilla/show_bug.cgi?id=56406 Bug ID: 56406 Summary: VirtualDirContext.setExtraResourcePaths incorrect separator in example semicolon instead comma Product: Tomcat 7 Version: 7.0.52 Hardware: All OS: All Status: NEW Severity: normal Priority: P2 Component: Documentation Assignee: dev@tomcat.apache.org Reporter: wider.st...@gmx.de The description and the code is using a comma to separate paths. The documentation is using a semicolon which results in a very hard to detect error when copying the example. * Example: * /=/Users/slaurent/mywebapp/src/main/webapp;/pictures=/Users/slaurent/sharedpictures * correct is: * Example: * /=/Users/slaurent/mywebapp/src/main/webapp,/pictures=/Users/slaurent/sharedpictures * -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/5676 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1586911 Blamelist: kkolinko,markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1856 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] 1586915 Blamelist: markt Build succeeded! sincerely, -The Buildbot
[Bug 56390] Tomcat keeps jar files in /WEB-INF/lib opened and app cannot be fully undeployed
https://issues.apache.org/bugzilla/show_bug.cgi?id=56390 --- Comment #7 from Mark Thomas --- Looking at this with YourKit the proposed patch (modified as suggested by Konstantin) addresses 2 out of the 4 open file issues I am seeing with lsof. I want to see if I can find the source of the remaining 2 files before I commit a fix. Note that triggering GC does clean up all the remaining open files. -- 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: r1586916 - /tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
Author: markt
Date: Sun Apr 13 01:25:03 2014
New Revision: 1586916
URL: http://svn.apache.org/r1586916
Log:
Remove debug code
Modified:
tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
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=1586916&r1=1586915&r2=1586916&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java Sun Apr 13
01:25:03 2014
@@ -403,8 +403,6 @@ public class TestParser extends TomcatBa
String result = res.toString();
-System.out.println(result);
-
// NOTE: The expected values must themselves be \ escaped below
Assert.assertTrue(result, result.contains("\\?resize01"));
Assert.assertTrue(result, result.contains(""));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1586915 - in /tomcat/tc7.0.x/trunk/test: org/apache/jasper/compiler/TestParser.java webapp-3.0/bug5nnnn/bug56334.jspx
Author: markt
Date: Sun Apr 13 01:24:15 2014
New Revision: 1586915
URL: http://svn.apache.org/r1586915
Log:
Fix some issues back-porting the bug 56334 test case
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug56334.jspx
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=1586915&r1=1586914&r2=1586915&view=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 Sun
Apr 13 01:24:15 2014
@@ -379,7 +379,7 @@ public class TestParser extends TomcatBa
public void testBug56334() throws Exception {
Tomcat tomcat = getTomcatInstance();
-File appDir = new File("test/webapp");
+File appDir = new File("test/webapp-3.0");
// app dir is relative to server home
StandardContext ctxt = (StandardContext) tomcat.addWebapp(null,
"/test", appDir.getAbsolutePath());
@@ -395,8 +395,6 @@ public class TestParser extends TomcatBa
String result = res.toString();
-System.out.println(result);
-
// NOTE: The expected values must themselves be \ escaped below
Assert.assertTrue(result, result.contains("\\?resize01"));
Assert.assertTrue(result, result.contains(""));
Modified: 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/bug56334.jspx?rev=1586915&r1=1586914&r2=1586915&view=diff
==
--- tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug56334.jspx (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug56334.jspx Sun Apr 13
01:24:15 2014
@@ -1,4 +1,4 @@
-http://www.w3.org/1999/xhtml";
xmlns:jsp="http://java.sun.com/JSP/Page";
xmlns:c="http://java.sun.com/jsp/jstl/core";>
-
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-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/1855 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] 1586912 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
Re: Java 8 compatibility for Tomcat 7
On 11/04/2014 06:49, Mark Thomas wrote: > On 11/04/2014 00:07, Emmanuel Bourg wrote: >> Le 11/04/2014 01:19, Mark Thomas a écrit : >> >>> I spoke with Filip at ApacheCon. This is meant to be an internal API >>> so the refactoring should be safe. >>> >>> I've done the back-port and fixed a handful of IDE warnings while I >>> was at it. >> >> Thank you Mark. Do you think this could be backported to Tomcat 6 too? >> It fails with the same error: >> >> http://87.98.165.193/debian/openjdk8-rebuild/logs-failed-jdk8/tomcat6_6.0.39-1_unstable_jdk8.log > > I'll take a look. The patch was rather larger. I have proposed it for 6.0.x. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1586913 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sat Apr 12 23:45:03 2014 New Revision: 1586913 URL: http://svn.apache.org/r1586913 Log: Add 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=1586913&r1=1586912&r2=1586913&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Apr 12 23:45:03 2014 @@ -43,6 +43,13 @@ PATCHES PROPOSED TO BACKPORT: http://people.apache.org/~markt/patches/2014-04-12-attribute-escaping-tc6-v1.patch +1: markt +* Enabling building with Java 8 + http://people.apache.org/~markt/patches/2014-04-12-build-with-java8-tc6-v1.patch + (Note: It is easier to verify the AbstractReplicatedMap changes by diffing + against the Tomcat 7 version of the class) + +1: markt + -1: + PATCHES/ISSUES THAT ARE STALLED: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1586911 - /tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Author: markt
Date: Sat Apr 12 23:38:54 2014
New Revision: 1586911
URL: http://svn.apache.org/r1586911
Log:
Align with 7.0.x
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1586911&r1=1586910&r2=1586911&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Sat Apr 12 23:38:54 2014
@@ -379,7 +379,7 @@ public abstract class AbstractReplicated
public Member[] getMapMembersExcl(Member[] exclude) {
synchronized (mapMembers) {
-@SuppressWarnings("unchecked")
+@SuppressWarnings("unchecked") // mapMembers has the correct type
HashMap list = (HashMap)mapMembers.clone();
for (int i=0; i
svn commit: r1586912 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
Author: markt
Date: Sat Apr 12 23:39:35 2014
New Revision: 1586912
URL: http://svn.apache.org/r1586912
Log:
Align with 8.0.x and remove unnecessary @SupressWarnings
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java?rev=1586912&r1=1586911&r2=1586912&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
Sat Apr 12 23:39:35 2014
@@ -53,7 +53,6 @@ public class ReplicatedContext extends S
* @exception LifecycleException if this component detects a fatal error
* that prevents this component from being used
*/
-@SuppressWarnings("unchecked")
@Override
protected synchronized void startInternal() throws LifecycleException {
-
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/5674 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1586890 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
svn commit: r1586906 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Author: markt
Date: Sat Apr 12 22:57:17 2014
New Revision: 1586906
URL: http://svn.apache.org/r1586906
Log:
Align with 8.0.x to aid future backports
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1586906&r1=1586905&r2=1586906&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Sat Apr 12 22:57:17 2014
@@ -50,7 +50,6 @@ import org.apache.juli.logging.LogFactor
/**
*
- * @author Filip Hanik
* @version 1.0
*/
public abstract class AbstractReplicatedMap
@@ -110,11 +109,11 @@ public abstract class AbstractReplicated
/**
* Simple lock object for transfers
*/
-protected transient Object stateMutex = new Object();
+protected final transient Object stateMutex = new Object();
/**
* A list of members in our map
*/
-protected transient HashMap mapMembers = new HashMap();
+protected final transient HashMap mapMembers = new
HashMap();
/**
* Our default send options
*/
@@ -206,7 +205,7 @@ public abstract class AbstractReplicated
protected void init(MapOwner owner, Channel channel, String mapContextName,
long timeout, int channelSendOptions,ClassLoader[] cls, boolean
terminate) {
long start = System.currentTimeMillis();
-log.info("Initializing AbstractReplicatedMap with context
name:"+mapContextName);
+if (log.isInfoEnabled()) log.info("Initializing AbstractReplicatedMap
with context name:"+mapContextName);
this.mapOwner = owner;
this.externalLoaders = cls;
this.channelSendOptions = channelSendOptions;
@@ -427,8 +426,8 @@ public abstract class AbstractReplicated
//check to see if the message is diffable
MapMessage msg = null;
if (rentry != null && rentry.isDiffable() && (isDirty ||
complete)) {
+rentry.lock();
try {
-rentry.lock();
//construct a diff message
msg = new MapMessage(mapContextName, MapMessage.MSG_BACKUP,
true, (Serializable) entry.getKey(),
null,
@@ -441,7 +440,6 @@ public abstract class AbstractReplicated
} finally {
rentry.unlock();
}
-
}
if (msg == null && complete) {
//construct a complete
@@ -630,17 +628,15 @@ public abstract class AbstractReplicated
MapEntry entry = innerMap.get(mapmsg.getKey());
if ( entry==null ) {
entry = new MapEntry((K) mapmsg.getKey(), (V)
mapmsg.getValue());
-entry.setBackup(false);
-entry.setProxy(true);
-entry.setBackupNodes(mapmsg.getBackupNodes());
-entry.setPrimary(mapmsg.getPrimary());
-innerMap.put(entry.getKey(), entry);
-} else {
-entry.setProxy(true);
-entry.setBackup(false);
-entry.setBackupNodes(mapmsg.getBackupNodes());
-entry.setPrimary(mapmsg.getPrimary());
+MapEntry old = innerMap.putIfAbsent(entry.getKey(),
entry);
+if (old != null) {
+entry = old;
+}
}
+entry.setProxy(true);
+entry.setBackup(false);
+entry.setBackupNodes(mapmsg.getBackupNodes());
+entry.setPrimary(mapmsg.getPrimary());
}
if (mapmsg.getMsgType() == MapMessage.MSG_REMOVE) {
@@ -666,8 +662,8 @@ public abstract class AbstractReplicated
if (entry.getValue() instanceof ReplicatedMapEntry) {
ReplicatedMapEntry diff = (ReplicatedMapEntry)
entry.getValue();
if (mapmsg.isDiff()) {
+diff.lock();
try {
-diff.lock();
diff.applyDiff(mapmsg.getDiffValue(), 0,
mapmsg.getDiffValue().length);
} catch (Exception x) {
log.error("Unable to apply diff to key:" +
entry.getKey(), x);
@@ -777,7 +773,6 @@ public abstract class AbstractReplicated
return; //the member was not part of our map.
}
}
-
if (log.isInfoEnabled())
log.info("Member["+member+"] disappeared. Related map entries will
be relocated to the new node.");
long start = System.currentTimeMillis();
@@ -1049,17
[Bug 56366] Use case-insensitive matching in StandardJarScanner
https://issues.apache.org/bugzilla/show_bug.cgi?id=56366 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID OS||All --- Comment #1 from Mark Thomas --- Section 10.5 of the Servlet spec requires that JAR files deployed as part of a web application have an extension of '.jar' Tomcat performs all operations relating to static files within web applicaitons (including JAR files) in a case sensitive manner to avoid security issues caused by mixing case sensitive and case insensitive matching even on platforms where the file system is not case sensitive. Note: - The JAR file specification explicitly places no limits on the name of a JAR file. - File names are case sensitive on most operating systems. Windows is the major exception. -- 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: r1586901 - /tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Author: markt
Date: Sat Apr 12 21:13:38 2014
New Revision: 1586901
URL: http://svn.apache.org/r1586901
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56405
Restore directory listings
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1586901&r1=1586900&r2=1586901&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Sat Apr
12 21:13:38 2014
@@ -934,11 +934,11 @@ public class DefaultServlet extends Http
ostream.write(resourceBody);
}
}
-// If a stream was configured, it needs to be copied to
-// the output (this method closes the stream)
-if (renderResult != null) {
-copy(resource, renderResult, ostream);
-}
+}
+// If a stream was configured, it needs to be copied to
+// the output (this method closes the stream)
+if (renderResult != null) {
+copy(resource, renderResult, ostream);
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56405] Directory listings are broken in 8.0.x
https://issues.apache.org/bugzilla/show_bug.cgi?id=56405 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED OS||All --- Comment #1 from Mark Thomas --- Fixed in 8.0.x for 8.0.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
svn propchange: r1586900 - svn:log
Author: kkolinko Revision: 1586900 Modified property: svn:log Modified: svn:log at Sat Apr 12 21:09:57 2014 -- --- svn:log (original) +++ svn:log Sat Apr 12 21:09:57 2014 @@ -1 +1,2 @@ +Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55483#c4 Return exact match as soon as it is found. Note without the change the same method is returned it just takes a little longer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1586899 - svn:log
Author: kkolinko Revision: 1586899 Modified property: svn:log Modified: svn:log at Sat Apr 12 21:09:12 2014 -- --- svn:log (original) +++ svn:log Sat Apr 12 21:09:12 2014 @@ -0,0 +1,2 @@ +Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55483#c4 +Return exact match as soon as it is found. Note without the change the same method is returned it just takes a little longer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55483] ELException when object has overloaded methods
https://issues.apache.org/bugzilla/show_bug.cgi?id=55483 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #6 from Mark Thomas --- Thanks for the report. The missing return didn't change the behaviour, it just meant that the exact match wasn't returned as quickly as it could have been. -- 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: r1586900 - /tomcat/tc7.0.x/trunk/java/org/apache/el/util/ReflectionUtil.java
Author: markt
Date: Sat Apr 12 20:58:35 2014
New Revision: 1586900
URL: http://svn.apache.org/r1586900
Log:
Return exact match as soon as it is found. Note without the change the same
method is returned it just takes a little longer
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/el/util/ReflectionUtil.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/el/util/ReflectionUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/el/util/ReflectionUtil.java?rev=1586900&r1=1586899&r2=1586900&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/el/util/ReflectionUtil.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/el/util/ReflectionUtil.java Sat Apr 12
20:58:35 2014
@@ -205,7 +205,7 @@ public class ReflectionUtil {
// If a method is found where every parameter matches exactly,
// return it
if (exactMatch == paramCount) {
-getMethod(base.getClass(), m);
+return getMethod(base.getClass(), m);
}
candidates.put(m, Integer.valueOf(exactMatch));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1586899 - /tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
Author: markt
Date: Sat Apr 12 20:57:45 2014
New Revision: 1586899
URL: http://svn.apache.org/r1586899
Log: (empty)
Modified:
tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
Modified: tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java?rev=1586899&r1=1586898&r2=1586899&view=diff
==
--- tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java (original)
+++ tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java Sat Apr 12
20:57:45 2014
@@ -205,7 +205,7 @@ public class ReflectionUtil {
// If a method is found where every parameter matches exactly,
// return it
if (exactMatch == paramCount) {
-getMethod(base.getClass(), m);
+return getMethod(base.getClass(), m);
}
candidates.put(m, Integer.valueOf(exactMatch));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1586897 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/modeler/BaseModelMBean.java webapps/docs/changelog.xml
Author: markt
Date: Sat Apr 12 20:49:37 2014
New Revision: 1586897
URL: http://svn.apache.org/r1586897
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56369
Ensure that removing an MBean notification listener reverts all the operations
performed when adding an MBean notification listener.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1586894
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java?rev=1586897&r1=1586896&r2=1586897&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
Sat Apr 12 20:49:37 2014
@@ -883,12 +883,15 @@ public class BaseModelMBean implements D
if (listener == null)
throw new IllegalArgumentException("Listener is null");
-if (generalBroadcaster == null)
-generalBroadcaster = new BaseNotificationBroadcaster();
-generalBroadcaster.removeNotificationListener(listener);
+if (generalBroadcaster != null) {
+generalBroadcaster.removeNotificationListener(listener);
+}
-}
+if (attributeBroadcaster != null) {
+attributeBroadcaster.removeNotificationListener(listener);
+}
+ }
/**
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=1586897&r1=1586896&r2=1586897&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Apr 12 20:49:37 2014
@@ -78,6 +78,11 @@
session.invalidate() from the session destroyed event for
that session. (markt)
+
+56369: Ensure that removing an MBean notification listener
+reverts all the operations performed when adding an MBean notification
+listener. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56369] BaseModelMBean does not clean-up attributeBroadcaster in removeNotificationListener()
https://issues.apache.org/bugzilla/show_bug.cgi?id=56369 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- This has been fixed in 8.0.x for 8.0.6 onwards. This has been fixed in 7.0.x for 7.0.54 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1586896 - /tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5nnnn/bug56334.jspx
Author: kkolinko Date: Sat Apr 12 20:48:04 2014 New Revision: 1586896 URL: http://svn.apache.org/r1586896 Log: svn:eol-style = native Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug56334.jspx (props changed) Propchange: tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug56334.jspx -- 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: r1586895 - /tomcat/trunk/test/webapp/bug5nnnn/bug56334.jspx
Author: kkolinko Date: Sat Apr 12 20:45:42 2014 New Revision: 1586895 URL: http://svn.apache.org/r1586895 Log: svn:eol-style = native Modified: tomcat/trunk/test/webapp/bug5/bug56334.jspx (props changed) Propchange: tomcat/trunk/test/webapp/bug5/bug56334.jspx -- 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: r1586894 - in /tomcat/trunk: java/org/apache/tomcat/util/modeler/BaseModelMBean.java webapps/docs/changelog.xml
Author: markt
Date: Sat Apr 12 20:43:34 2014
New Revision: 1586894
URL: http://svn.apache.org/r1586894
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56369
Ensure that removing an MBean notification listener reverts all the operations
performed when adding an MBean notification listener.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java?rev=1586894&r1=1586893&r2=1586894&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java Sat
Apr 12 20:43:34 2014
@@ -860,12 +860,15 @@ public class BaseModelMBean implements D
if (listener == null)
throw new IllegalArgumentException("Listener is null");
-if (generalBroadcaster == null)
-generalBroadcaster = new BaseNotificationBroadcaster();
-generalBroadcaster.removeNotificationListener(listener);
+if (generalBroadcaster != null) {
+generalBroadcaster.removeNotificationListener(listener);
+}
-}
+if (attributeBroadcaster != null) {
+attributeBroadcaster.removeNotificationListener(listener);
+}
+ }
public String getModelerType() {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1586894&r1=1586893&r2=1586894&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Apr 12 20:43:34 2014
@@ -88,6 +88,11 @@
entry is invalidated by being overridden by a new resource in a
different WebResourceSet. (markt)
+
+56369: Ensure that removing an MBean notification listener
+reverts all the operations performed when adding an MBean notification
+listener. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56051] FarmWarDeployer sporadically fails with "application being serviced"
https://issues.apache.org/bugzilla/show_bug.cgi?id=56051 Mark Thomas changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |WORKSFORME --- Comment #4 from Mark Thomas --- I can't reproduce this with the current 7.0.x trunk. If you are able to recreate this with the latest 7.0.x release then please feel free to re-open this bug and provide the configuration you are using. -- 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: r1586893 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sat Apr 12 20:25:10 2014 New Revision: 1586893 URL: http://svn.apache.org/r1586893 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=1586893&r1=1586892&r2=1586893&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Apr 12 20:25:10 2014 @@ -35,7 +35,7 @@ PATCHES PROPOSED TO BACKPORT: Explicitly specify --LogPath path when uninstalling Windows service. (The default value for that option was "%SystemRoot%\System32\LogFiles\Apache".) https://people.apache.org/~kkolinko/patches/2014-04-11_tc6_tomcat_nsi.patch - +1: kkolinko + +1: kkolinko, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56334] Double Backslash Escaping in Attributes
https://issues.apache.org/bugzilla/show_bug.cgi?id=56334 Mark Thomas changed: What|Removed |Added Component|Jasper |Jasper Version|7.0.52 |unspecified Product|Tomcat 7|Tomcat 6 Target Milestone|--- |default -- 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 56334] Double Backslash Escaping in Attributes
https://issues.apache.org/bugzilla/show_bug.cgi?id=56334 --- Comment #4 from Mark Thomas --- This has been fixed in 8.0.x for 8.0.6 onwards. This has been fixed in 7.0.x for 7.0.54 onwards. The fix has been proposed for 6.0.x. -- 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: r1586892 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sat Apr 12 20:23:18 2014 New Revision: 1586892 URL: http://svn.apache.org/r1586892 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=1586892&r1=1586891&r2=1586892&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Apr 12 20:23:18 2014 @@ -38,6 +38,12 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334 + Correct double unescaping + http://people.apache.org/~markt/patches/2014-04-12-attribute-escaping-tc6-v1.patch + +1: markt + + PATCHES/ISSUES THAT ARE STALLED: None - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1586891 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/ test/org/apache/jasper/compiler/ test/webapp-3.0/bug5nnnn/ webapps/docs/
Author: markt
Date: Sat Apr 12 20:15:17 2014
New Revision: 1586891
URL: http://svn.apache.org/r1586891
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334
Correct double backslash escaping in attributes
Added:
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug56334.jspx
- copied, changed from r1586890,
tomcat/trunk/test/webapp/bug5/bug56334.jspx
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestELParser.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:r1586890
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java?rev=1586891&r1=1586890&r2=1586891&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java Sat Apr
12 20:15:17 2014
@@ -209,7 +209,7 @@ public class ELParser {
prev = 0;
if (ch == '\\') {
buf.append('\\');
-prev = '\\';
+continue;
} else if (ch == '$'
|| (!isDeferredSyntaxAllowedAsLiteral && ch == '#')) {
buf.append(ch);
@@ -468,18 +468,18 @@ public class ELParser {
@Override
public void visit(Function n) throws JasperException {
-output.append(n.getOriginalText());
+output.append(Generator.escape(n.getOriginalText()));
output.append('(');
}
@Override
public void visit(Text n) throws JasperException {
-output.append(n.getText());
+output.append(Generator.escape(n.getText()));
}
@Override
public void visit(ELText n) throws JasperException {
-output.append(n.getText());
+output.append(Generator.escape(n.getText()));
}
}
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestELParser.java?rev=1586891&r1=1586890&r2=1586891&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestELParser.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestELParser.java Sat
Apr 12 20:15:17 2014
@@ -170,6 +170,18 @@ public class TestELParser {
}
+@Test
+public void testEscape01() throws JasperException {
+doTestParser("${''}");
+}
+
+
+@Test
+public void testEscape02() throws JasperException {
+doTestParser("x${''}");
+}
+
+
private void doTestParser(String input) throws JasperException {
Nodes nodes = ELParser.parse(input, false);
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=1586891&r1=1586890&r2=1586891&view=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 Sat
Apr 12 20:15:17 2014
@@ -375,6 +375,37 @@ public class TestParser extends TomcatBa
result.contains("[4: [data-test]: [window.alert('Hello 'World
<&>'!')]]"));
}
+@Test
+public void testBug56334() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File("test/webapp");
+// app dir is relative to server home
+StandardContext ctxt = (StandardContext) tomcat.addWebapp(null,
+"/test", appDir.getAbsolutePath());
+
+// This test needs the JSTL libraries
+File lib = new File("webapps/examples/WEB-INF/lib");
+ctxt.setAliases("/WEB-INF/lib=" + lib.getCanonicalPath());
+
+tomcat.start();
+
+ByteChunk res = getUrl("http://localhost:"; + getPort() +
+"/test/bug5/bug56334.jspx");
+
+String result = res.toString();
+
+System.out.println(result);
+
+// NOTE: The expected values must themselves be \ escaped below
+Assert.assertTrue(result, result.contains("\\?resize01"));
+Assert.assertTrue(result, result.contains(""));
+Assert.assertTrue(result, result.contains(""));
+Assert.assertTrue(result, result.con
svn commit: r1586890 - in /tomcat/trunk: java/org/apache/jasper/compiler/ELParser.java test/org/apache/jasper/compiler/TestELParser.java test/org/apache/jasper/compiler/TestParser.java test/webapp/bug
Author: markt
Date: Sat Apr 12 20:07:54 2014
New Revision: 1586890
URL: http://svn.apache.org/r1586890
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334
Correct double backslash escaping in attributes
Added:
tomcat/trunk/test/webapp/bug5/bug56334.jspx
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java
tomcat/trunk/test/org/apache/jasper/compiler/TestELParser.java
tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java?rev=1586890&r1=1586889&r2=1586890&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java Sat Apr 12
20:07:54 2014
@@ -209,7 +209,7 @@ public class ELParser {
prev = 0;
if (ch == '\\') {
buf.append('\\');
-prev = '\\';
+continue;
} else if (ch == '$'
|| (!isDeferredSyntaxAllowedAsLiteral && ch == '#')) {
buf.append(ch);
@@ -468,18 +468,18 @@ public class ELParser {
@Override
public void visit(Function n) throws JasperException {
-output.append(n.getOriginalText());
+output.append(Generator.escape(n.getOriginalText()));
output.append('(');
}
@Override
public void visit(Text n) throws JasperException {
-output.append(n.getText());
+output.append(Generator.escape(n.getText()));
}
@Override
public void visit(ELText n) throws JasperException {
-output.append(n.getText());
+output.append(Generator.escape(n.getText()));
}
}
}
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestELParser.java?rev=1586890&r1=1586889&r2=1586890&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestELParser.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestELParser.java Sat Apr 12
20:07:54 2014
@@ -170,6 +170,18 @@ public class TestELParser {
}
+@Test
+public void testEscape01() throws JasperException {
+doTestParser("${''}");
+}
+
+
+@Test
+public void testEscape02() throws JasperException {
+doTestParser("x${''}");
+}
+
+
private void doTestParser(String input) throws JasperException {
Nodes nodes = ELParser.parse(input, false);
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=1586890&r1=1586889&r2=1586890&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java Sat Apr 12
20:07:54 2014
@@ -380,6 +380,40 @@ public class TestParser extends TomcatBa
result.contains("[4: [data-test]: [window.alert('Hello 'World
<&>'!')]]"));
}
+@Test
+public void testBug56334() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File("test/webapp");
+// app dir is relative to server home
+StandardContext ctxt = (StandardContext) tomcat.addWebapp(null,
+"/test", appDir.getAbsolutePath());
+
+// This test needs the JSTL libraries
+File lib = new File("webapps/examples/WEB-INF/lib");
+ctxt.setResources(new StandardRoot(ctxt));
+ctxt.getResources().createWebResourceSet(
+WebResourceRoot.ResourceSetType.POST, "/WEB-INF/lib",
+lib.getAbsolutePath(), null, "/");
+
+tomcat.start();
+
+ByteChunk res = getUrl("http://localhost:"; + getPort() +
+"/test/bug5/bug56334.jspx");
+
+String result = res.toString();
+
+System.out.println(result);
+
+// NOTE: The expected values must themselves be \ escaped below
+Assert.assertTrue(result, result.contains("\\?resize01"));
+Assert.assertTrue(result, result.contains(""));
+Assert.assertTrue(result, result.contains(""));
+Assert.assertTrue(result, result.contains(""));
+Assert.assertTrue(result, result.contains(""));
+Assert.assertTrue(result, result.contains("<\\?resize04/>"));
+}
+
/** Assertion for text printed by tags:echo */
private static void assertEcho(String result, String expe
[Bug 56405] New: Directory listings are broken in 8.0.x
https://issues.apache.org/bugzilla/show_bug.cgi?id=56405
Bug ID: 56405
Summary: Directory listings are broken in 8.0.x
Product: Tomcat 8
Version: trunk
Hardware: PC
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: knst.koli...@gmail.com
It is issue in the current 8.0.x trunk apparently introduced by r1582440
I think it does not affect 8.0.5 (r1580930)
Steps to reproduce:
1. Configure DefaultServlet with init-param listings equal to true.
2. Go to a directory in Tomcat. Expected: listing of a directory, actual:
blank screen (zero-length response).
The following code on lines 919-920:
if (resource.isDirectory()) {
renderResult = render(getPathPrefix(request),
resource);
} else {
The 'renderResult' is an InputStream which have to be copy()'ed to output, but
copying never happens.
--
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 Connectors 1.2.40
On 11.04.2014 15:17, Mladen Turk wrote: > Hi, > > Apache Tomcat Connectors 1.2.40 release candidate is ready > for vote at [1]. The build was done using tag [2]. > This version is bugfix release, fixing some issues > found in version 1.2.39. > > > The VOTE will remain open for at least 48 hours. > > The Apache Tomcat Connectors 1.2.40 is > [X] Stable, go ahead and release > [ ] Broken because of ... +1 Details: - Sigs and hashes OK - key in KEYS file - key is only signed by Jean-Frederic, would be good to find a few more people to sign it for the web of trust - gz and zip for src identical - src consistent with svn tag, except for the following expected deltas: - LICENSE and NOTICE moved one directory up (OK) - KEYS not in dist (OK) - deprectated jk2 xdocs missing in dist (OK) - additional generated files in dist: aclocal.m4, configure, Makefile.in, config.h.in, html docs in dist (OK) - additional auto tool copied files in dist: install-sh, ltmain.sh, missing (OK) - build.properties.autoconf, native/build.xml and the jkant directory missing from dist. Builds succesfully on all tested platforms: - Solaris 8 Sparc using gcc 4.1.2 as 32 Bit Binaries for 1.3, 2.0, 2.2 - Solaris 10 Sparc using gcc 4.8.2 as 32 Bit Binaries for 2.4 - SLES 10 64 bit using platform gcc for 1.3, 2.0, 2.2 - SLES 10 32 bit using platform gcc for 2.2 - SLES 11 64 bit using platform gcc for 2.2, 2.4 - RHEL 5 64bit using platform gcc for 2.2 - SLES 6 64 bit using platform gcc for 2.2, 2.4 using CFLAGS: -O2 -g -Wall -fno-strict-aliasing (and -mpcu=v9 on Solaris) Additional observations (not a regression, affected file list slightly different from 1.2.37): - File ltmain.sh in src tar and zip has perms 644 instead of 755 (not a regression). - Some build warnings because we use defines coming from auto tools which overlap with httpd defines: In file included from ../common/jk_global.h:29:0, from mod_jk.c:89: ../common/config.h:77:0: warning: "PACKAGE_NAME" redefined [enabled by default] #define PACKAGE_NAME "mod_jk" ^ In file included from .../apache/include/ap_config.h:138:0, from mod_jk.c:29: .../apache/include/ap_config_auto.h:213:0: note: this is the location of the previous definition #define PACKAGE_NAME "" ^ The same for PACKAGE_STRING, PACKAGE_TARNAME and PACKAGE_VERSION. I haven't checked how easy it would be to rename them or if they have some fixed meaning with auto tools. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1586857 - in /tomcat/trunk: java/org/apache/tomcat/util/net/Nio2Endpoint.java webapps/docs/changelog.xml
On 12/04/2014 06:35, r...@apache.org wrote: > Author: remm > Date: Sat Apr 12 12:35:04 2014 > New Revision: 1586857 > > URL: http://svn.apache.org/r1586857 > Log: > Since nobody apparently objects, and with the testsuite passing 100% very > reliably, upgrade NIO2 to beta. Great news. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56397] Establish parallel Maven-based build process
https://issues.apache.org/bugzilla/show_bug.cgi?id=56397 --- Comment #2 from Mark Thomas --- This is one of the things discussed at the Tomcat Summit this week. My proposal was to start a multi-module maven project in the sandbox using svn externals to pull in the relevant bits of Tomcat source for each module. I'd create a couple of modules to see if it was doable and then leave it for the next Maven fan who comes along championing a switch to finish off. If they are able to create a working build then at that point the community can compare the Maven build and the Ant build and decide which is best. I plan to close this issue as LATER once I have the first couple of modules created. Right now I am not at all convinced of the benfits of switching - I think your move to a single source tree was one of the best things we ever did for making the code easier to work with - but switching to Maven keeps coming up and rather than yet another abstract discussion this provides a mechansim for us to have something concrete to compare. -- 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: r1586857 - in /tomcat/trunk: java/org/apache/tomcat/util/net/Nio2Endpoint.java webapps/docs/changelog.xml
Author: remm
Date: Sat Apr 12 12:35:04 2014
New Revision: 1586857
URL: http://svn.apache.org/r1586857
Log:
Since nobody apparently objects, and with the testsuite passing 100% very
reliably, upgrade NIO2 to beta.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1586857&r1=1586856&r2=1586857&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Sat Apr 12
12:35:04 2014
@@ -352,7 +352,7 @@ public class Nio2Endpoint extends Abstra
paused = false;
// FIXME: remove when more stable
-log.warn("The NIO2 connector is currently EXPERIMENTAL and should
not be used in production");
+log.warn("The NIO2 connector is currently BETA and should not be
used in production");
// Create worker collection
if ( getExecutor() == null ) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1586857&r1=1586856&r2=1586857&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Apr 12 12:35:04 2014
@@ -99,7 +99,7 @@
56336: AJP output corruption and errors. (remm)
-Handle incomplete writes in NIO2, just in case. (remm)
+Handle incomplete writes in NIO2. (remm)
Code cleanups and i18n in NIO2. (remm)
@@ -107,6 +107,12 @@
Fix extra onDataAvailable calls. (remm)
+
+Fix gather writes in NIO2 SSL. (remm)
+
+
+Upgrade the NIO2 connectors to beta, but still not ready for
production. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56397] Establish parallel Maven-based build process
https://issues.apache.org/bugzilla/show_bug.cgi?id=56397 --- Comment #1 from Remy Maucherat --- I don't see how this is doable or useful since the point of maven is to accept its source code structure and componentization. IMO it is either Tomcat switches cleanly to Maven (or another similar one) for a next version or it stays with the current Ant build. -- 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 Native 1.1.30
On 10.04.2014 13:50, Mladen Turk wrote: > Version 1.1.30 is bug fixing release with added ECDH > if supported by OpenSSL library. > The proposed release artefacts can be found at [1], > and the build was done using tag [2]. > > The VOTE will remain open for at least 48 hours. > > The Apache Tomcat Native 1.1.30 is > [X] Stable, go ahead and release > [ ] Broken because of ... +1 to release Detailed results below. No progress for items documented in TODO.txt, so there is still room for improvement. - Tested with APR 1.5.0 and OpenSSL 1.0.1g. Java version 1.7.0_51 for pure tcnative tests/examples, Tomcat testsuite taken from TC 7 tested with 1.6.0_45, native part configured against Java 1.5.0_22. - Platforms Solaris 10 Sparc, SLES 11 64 Bits, RHEL 6 64 Bits - MD5 OK - signatures OK - gz and zip for sources consistent - source dist consistent with svn tag - config-guess and config.sub from apr head of 1.4 or 1.5 or trunk (copied by buildconf) 1-3 months outdated, not too bad. - VERSIONS says OpenSSL 1.0.1g (OK) and APR 1.4.8 - not sure what policy we follow here, e.g. when we'll update to APR 1.5 - recreated release with jnirelease script, results are consistent with source dist, except for minor expected diffs in CHANGELOG.txt, build-outputs.mk and generated docs (whitespace and attribute ordering) - make succeeds and builds lib (no warnings) - "ant test" succeeds - all unit tests contained in TC 7 head run successful with APR connector and this version of tcnative. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
