buildbot success in on tomcat-8-trunk
The Buildbot has detected a restored build on builder tomcat-8-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-8-trunk/builds/462 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1731303 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: r1731308 - /tomcat/tc6.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
Author: markt
Date: Fri Feb 19 22:59:08 2016
New Revision: 1731308
URL: http://svn.apache.org/viewvc?rev=1731308&view=rev
Log:
Back-port the send file unit test
Added:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
- copied, changed from r1731306,
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
Copied:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java (from
r1731306,
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java?p2=tomcat/tc6.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java&p1=tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java&r1=1731306&r2=1731308&rev=1731308&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
(original)
+++ tomcat/tc6.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
Fri Feb 19 22:59:08 2016
@@ -36,7 +36,6 @@ import static org.junit.Assert.assertEqu
import org.junit.Test;
import org.apache.catalina.Context;
-import org.apache.catalina.Globals;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
@@ -134,10 +133,10 @@ public class TestSendFile extends Tomcat
resp.setContentType("'application/octet-stream");
resp.setCharacterEncoding("ISO-8859-1");
resp.setContentLength((int) f.length());
-if
(Boolean.TRUE.equals(req.getAttribute(Globals.SENDFILE_SUPPORTED_ATTR))) {
-req.setAttribute(Globals.SENDFILE_FILENAME_ATTR,
f.getAbsolutePath());
-req.setAttribute(Globals.SENDFILE_FILE_START_ATTR, new
Long(0));
-req.setAttribute(Globals.SENDFILE_FILE_END_ATTR, new
Long(f.length()));
+if
(Boolean.TRUE.equals(req.getAttribute("org.apache.tomcat.sendfile.support"))) {
+req.setAttribute("org.apache.tomcat.sendfile.filename",
f.getAbsolutePath());
+req.setAttribute("org.apache.tomcat.sendfile.start", new
Long(0));
+req.setAttribute("org.apache.tomcat.sendfile.end", new
Long(f.length()));
} else {
byte[] c = new byte[8192];
BufferedInputStream in = null;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1731306 - /tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
Author: markt
Date: Fri Feb 19 22:53:50 2016
New Revision: 1731306
URL: http://svn.apache.org/viewvc?rev=1731306&view=rev
Log:
Back-port the send file unit test
Added:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
- copied, changed from r1731286,
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
Copied:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java (from
r1731286,
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java?p2=tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java&p1=tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java&r1=1731286&r2=1731306&rev=1731306&view=diff
==
--- tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
Fri Feb 19 22:53:50 2016
@@ -68,7 +68,7 @@ public class TestSendFile extends Tomcat
tomcat.start();
ByteChunk bc = new ByteChunk();
-Map> respHeaders = new HashMap<>();
+Map> respHeaders = new HashMap>();
for (int i=0; ihttp://localhost:"; + getPort() + "/servlet" +
i, bc, null, respHeaders);
@@ -88,7 +88,11 @@ public class TestSendFile extends Tomcat
public File generateFile(String dir, String suffix, int size) throws
IOException {
String name = "testSendFile-" + System.currentTimeMillis() + suffix +
".txt";
File f = new File(dir, name);
-try (FileWriter fw = new FileWriter(f, false); BufferedWriter w = new
BufferedWriter(fw);) {
+FileWriter fw = null;
+BufferedWriter w = null;
+try {
+fw = new FileWriter(f, false);
+w = new BufferedWriter(fw);
int defSize = 8192;
while (size > 0) {
int bytes = Math.min(size, defSize);
@@ -98,6 +102,13 @@ public class TestSendFile extends Tomcat
size = size - bytes;
}
w.flush();
+} finally {
+if (w != null) {
+w.close();
+}
+if (fw != null) {
+fw.close();
+}
}
System.out.println("Created file:" + f.getAbsolutePath() + " with " +
f.length()
+ " bytes.");
@@ -122,15 +133,16 @@ public class TestSendFile extends Tomcat
resp.setContentType("'application/octet-stream");
resp.setCharacterEncoding("ISO-8859-1");
-resp.setContentLengthLong(f.length());
+resp.setContentLength((int) f.length());
if
(Boolean.TRUE.equals(req.getAttribute(Globals.SENDFILE_SUPPORTED_ATTR))) {
req.setAttribute(Globals.SENDFILE_FILENAME_ATTR,
f.getAbsolutePath());
req.setAttribute(Globals.SENDFILE_FILE_START_ATTR, new
Long(0));
req.setAttribute(Globals.SENDFILE_FILE_END_ATTR, new
Long(f.length()));
} else {
byte[] c = new byte[8192];
-try (BufferedInputStream in = new BufferedInputStream(
-new FileInputStream(f))) {
+BufferedInputStream in = null;
+try {
+in = new BufferedInputStream(new FileInputStream(f));
int len = 0;
int written = 0;
long start = System.currentTimeMillis();
@@ -142,6 +154,10 @@ public class TestSendFile extends Tomcat
}
} while (len > 0);
System.out.println("Server Wrote "+written + " bytes in
"+(System.currentTimeMillis()-start)+" ms.");
+} finally {
+if (in != null) {
+in.close();
+}
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1731304 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/Http11NioProcessor.java java/org/apache/tomcat/util/net/NioEndpoint.java java/org/apache/tomcat/util/net/SendfileState
Author: markt Date: Fri Feb 19 22:31:42 2016 New Revision: 1731304 URL: http://svn.apache.org/viewvc?rev=1731304&view=rev Log: Follow-up to r1731119 There are three possible return values rather than two for processSendFile() Added: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SendfileState.java - copied unchanged from r1731303, tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SendfileState.java Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 19 22:31:42 2016 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702 744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1726171-1726173,1 726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009 +/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759
svn commit: r1731303 - in /tomcat/tc8.0.x/trunk/java/org/apache: coyote/http11/Http11Nio2Processor.java coyote/http11/Http11NioProcessor.java tomcat/util/net/Nio2Endpoint.java tomcat/util/net/NioEndpo
Author: markt
Date: Fri Feb 19 22:27:39 2016
New Revision: 1731303
URL: http://svn.apache.org/viewvc?rev=1731303&view=rev
Log:
Follow-up to r1731093.
There are three possible return values rather than two for processSendFile()
Added:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SendfileState.java
- copied unchanged from r1731249,
tomcat/trunk/java/org/apache/tomcat/util/net/SendfileState.java
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java?rev=1731303&r1=1731302&r2=1731303&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
Fri Feb 19 22:27:39 2016
@@ -275,17 +275,19 @@ public class Http11Nio2Processor extends
@Override
-protected boolean breakKeepAliveLoop(
-SocketWrapper socketWrapper) {
+protected boolean breakKeepAliveLoop(SocketWrapper
socketWrapper) {
openSocket = keepAlive;
// Do sendfile as needed: add socket to sendfile and end
if (sendfileData != null && !getErrorState().isError()) {
((Nio2Endpoint.Nio2SocketWrapper)
socketWrapper).setSendfileData(sendfileData);
sendfileData.keepAlive = keepAlive;
-switch (((Nio2Endpoint) endpoint)
-.processSendfile((Nio2Endpoint.Nio2SocketWrapper)
socketWrapper)) {
+switch (((Nio2Endpoint) endpoint).processSendfile(
+(Nio2Endpoint.Nio2SocketWrapper) socketWrapper)) {
case DONE:
return false;
+case PENDING:
+sendfileInProgress = true;
+return true;
case ERROR:
// Write failed
if (log.isDebugEnabled()) {
@@ -293,9 +295,6 @@ public class Http11Nio2Processor extends
}
setErrorState(ErrorState.CLOSE_NOW, null);
return true;
-case PENDING:
-sendfileInProgress = true;
-return true;
}
}
return false;
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1731303&r1=1731302&r2=1731303&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Fri Feb 19 22:27:39 2016
@@ -282,17 +282,23 @@ public class Http11NioProcessor extends
SelectionKey key = socketWrapper.getSocket().getIOChannel().keyFor(
socketWrapper.getSocket().getPoller().getSelector());
//do the first write on this thread, might as well
-if (socketWrapper.getSocket().getPoller().processSendfile(key,
-(KeyAttachment) socketWrapper, true)) {
+switch (socketWrapper.getSocket().getPoller().processSendfile(
+key, (KeyAttachment) socketWrapper, true)) {
+case DONE:
+// If sendfile is complete, no need to break keep-alive loop
+sendfileData = null;
+return false;
+case PENDING:
sendfileInProgress = true;
-} else {
+return true;
+case ERROR:
// Write failed
if (log.isDebugEnabled()) {
log.debug(sm.getString("http11processor.sendfile.error"));
}
setErrorState(ErrorState.CLOSE_NOW, null);
+return true;
}
-return true;
}
return false;
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1731303&r1=1731302&r2=1731303&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Fri
Feb 19 22:27:39 2016
@@ -873,10 +873,6 @@ public class Nio2Endpoint extends Abstra
TimeUnit.MILLISECO
Re: TestSendFile.NIO is failing in Tomcat 8
On 19/02/2016 21:15, Konstantin Kolinko wrote: > Hi! > > The following test fails at Buildbot in Tomcat 8 for several last runs > (##460, 461): > I guess something is wrong with recent processor recycle fix (I have > not reviewed it yet). Yep. I'm going to have to back-port some more changes. Currently we only return true/false but we need to return one of: - in progress - complete - error Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
TestSendFile.NIO is failing in Tomcat 8
Hi! The following test fails at Buildbot in Tomcat 8 for several last runs (##460, 461): TEST-org.apache.catalina.connector.TestSendFile.NIO.txt BIO, NIO2 are OK, Tomcat trunk is OK, Tomcat 7 is OK. Log file: https://ci.apache.org/projects/tomcat/tomcat8/logs/logs/1731288/TEST-org.apache.catalina.connector.TestSendFile.NIO.txt Stdout of NIO test: Client received 10 bytes in 177 ms. - --- followed by java.net.SocketTimeoutException: Read timed out Stdout of same NIO2 test: Client received 10 bytes in 182 ms. Client received 20 bytes in 6 ms. Client received 30 bytes in 6 ms. Client received 40 bytes in 4 ms. Client received 50 bytes in 6 ms. Client received 60 bytes in 6 ms. Client received 70 bytes in 8 ms. Client received 80 bytes in 10 ms. Client received 90 bytes in 11 ms. Client received 100 bytes in 10 ms. - --- I guess something is wrong with recent processor recycle fix (I have not reviewed it yet). Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1731291 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java test/org/apache/catalina/startup/TestContextConfigAnnotation.java webapps/docs/changelog.xml
On 19/02/2016 19:30, ma...@apache.org wrote: > Author: markt > Date: Fri Feb 19 19:30:53 2016 > New Revision: 1731291 > > URL: http://svn.apache.org/viewvc?rev=1731291&view=rev > Log: > Refactor to use a local variable rather than a field. > Even after the cache is cleared it uses significant memory because of the > size the Map has grown to. The next biggest target is the cached Manifests. I'm not (yet) convinced we need to go that far. If we did, caching them the same way we cache the JarEntries is probably the way to go. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1731291 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java test/org/apache/catalina/startup/TestContextConfigAnnotation.java webapps/docs/changelog.xml
Author: markt
Date: Fri Feb 19 19:30:53 2016
New Revision: 1731291
URL: http://svn.apache.org/viewvc?rev=1731291&view=rev
Log:
Refactor to use a local variable rather than a field.
Even after the cache is cleared it uses significant memory because of the size
the Map has grown to.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1731291&r1=1731290&r2=1731291&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Fri Feb 19
19:30:53 2016
@@ -222,14 +222,6 @@ public class ContextConfig implements Li
new HashMap<>();
/**
- * Cache of JavaClass objects (byte code) by fully qualified class name.
- * Only populated if it is necessary to scan the super types and interfaces
- * as part of the processing for {@link HandlesTypes}.
- */
-protected final Map javaClassCache =
-new HashMap<>();
-
-/**
* Flag that indicates if at least one {@link HandlesTypes} entry is
present
* that represents an annotation.
*/
@@ -1141,13 +1133,15 @@ public class ContextConfig implements Li
if (!webXml.isMetadataComplete() || typeInitializerMap.size() > 0) {
// Step 4. Process /WEB-INF/classes for annotations and
// @HandlesTypes matches
+Map javaClassCache = new HashMap<>();
+
if (ok) {
WebResource[] webResources =
context.getResources().listResources("/WEB-INF/classes");
for (WebResource webResource : webResources) {
processAnnotationsWebResource(webResource, webXml,
-webXml.isMetadataComplete());
+webXml.isMetadataComplete(), javaClassCache);
}
}
@@ -1157,7 +1151,7 @@ public class ContextConfig implements Li
// container fragments)
if (ok) {
processAnnotations(
-orderedFragments, webXml.isMetadataComplete());
+orderedFragments, webXml.isMetadataComplete(),
javaClassCache);
}
// Cache, if used, is no longer required so clear it
@@ -1899,7 +1893,7 @@ public class ContextConfig implements Li
}
protected void processAnnotations(Set fragments,
-boolean handlesTypesOnly) {
+boolean handlesTypesOnly, Map
javaClassCache) {
for(WebXml fragment : fragments) {
// Only need to scan for @HandlesTypes matches if any of the
// following are true:
@@ -1914,7 +1908,7 @@ public class ContextConfig implements Li
// no impact on distributable
annotations.setDistributable(true);
URL url = fragment.getURL();
-processAnnotationsUrl(url, annotations, htOnly);
+processAnnotationsUrl(url, annotations, htOnly, javaClassCache);
Set set = new HashSet<>();
set.add(annotations);
// Merge annotations into fragment - fragment takes priority
@@ -1923,7 +1917,8 @@ public class ContextConfig implements Li
}
protected void processAnnotationsWebResource(WebResource webResource,
-WebXml fragment, boolean handlesTypesOnly) {
+WebXml fragment, boolean handlesTypesOnly,
+Map javaClassCache) {
if (webResource.isDirectory()) {
WebResource[] webResources =
@@ -1936,13 +1931,13 @@ public class ContextConfig implements Li
webResource.getURL()));
}
for (WebResource r : webResources) {
-processAnnotationsWebResource(r, fragment,
handlesTypesOnly);
+processAnnotationsWebResource(r, fragment,
handlesTypesOnly, javaClassCache);
}
}
} else if (webResource.isFile() &&
webResource.getName().endsWith(".class")) {
try (InputStream is = webResource.getInputStream()) {
-processAnnotationsStream(is, fragment, handlesTypesOnly);
+processAnnotationsStream(is, fragment, handlesTypesOnly,
javaClassCache);
} catch (IOException e) {
log.error(sm.getString("contextConfig.inputStreamWebResource",
webResource.getWebappPath()),e);
@@ -1955,16 +1950,16 @@ public class ContextConfig implements Li
protected void processAnnotationsUrl(URL url, WebXml fragment,
-
[Bug 57809] Don't store merged web.xml
https://bz.apache.org/bugzilla/show_bug.cgi?id=57809 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #7 from Mark Thomas --- Thanks for the patch. I'd forgotten about this issue until after I had already fixed the code buy my approach was broadly similar. The constant for the attribute name has been deprecated in 8.0.x and the constant and the use of it has been removed in 9.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: r1731288 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java java/org/apache/tomcat/util/scan/Constants.java webapps/docs/changelog.xml
Author: markt Date: Fri Feb 19 19:08:14 2016 New Revision: 1731288 URL: http://svn.apache.org/viewvc?rev=1731288&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57809 Deprecate the custom context attribute that holds the effective web.xml. Components needing access to configuration information should access it via the Servlet API. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/Constants.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 19 19:08:14 2016 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452 7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689
svn commit: r1731284 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java java/org/apache/tomcat/util/scan/Constants.java webapps/docs/changelog.xml
Author: markt
Date: Fri Feb 19 19:03:04 2016
New Revision: 1731284
URL: http://svn.apache.org/viewvc?rev=1731284&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57809
Remove the custom context attribute that held the effective web.xml. Components
needing access to configuration information may access it via the Servlet API.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/tomcat/util/scan/Constants.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1731284&r1=1731283&r2=1731284&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Fri Feb 19
19:03:04 2016
@@ -1191,16 +1191,8 @@ public class ContextConfig implements Li
configureContext(webXml);
}
-// Step 9a. Make the merged web.xml available to other
-// components, specifically Jasper, to save those components
-// from having to re-generate it.
-// TODO Use a ServletContainerInitializer for Jasper
-String mergedWebXml = webXml.toXml();
-sContext.setAttribute(
- org.apache.tomcat.util.scan.Constants.MERGED_WEB_XML,
- mergedWebXml);
if (context.getLogEffectiveWebXml()) {
-log.info("web.xml:\n" + mergedWebXml);
+log.info("web.xml:\n" + webXml.toXml());
}
// Always need to look for static resources
Modified: tomcat/trunk/java/org/apache/tomcat/util/scan/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/Constants.java?rev=1731284&r1=1731283&r2=1731284&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/scan/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/Constants.java Fri Feb 19
19:03:04 2016
@@ -34,11 +34,4 @@ public final class Constants {
public static final String JAR_EXT = ".jar";
public static final String WEB_INF_LIB = "/WEB-INF/lib/";
public static final String WEB_INF_CLASSES = "/WEB-INF/classes";
-
-/* Context attributes */
-@Deprecated // Third party components should use standard Servlet API
-// mechanisms such as a ServletContainerInitializer to access
-// configuration information
-public static final String MERGED_WEB_XML =
-"org.apache.tomcat.util.scan.MergedWebXml";
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1731284&r1=1731283&r2=1731284&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Feb 19 19:03:04 2016
@@ -103,6 +103,11 @@
Switch to the web application class loader to the
ParallelWebappClassLoader by default. (markt)
+
+57809: Remove the custom context attribute that held the
+effective web.xml. Components needing access to configuration
+information may access it via the Servlet API. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1731283 - /tomcat/trunk/java/org/apache/tomcat/util/scan/Constants.java
Author: markt
Date: Fri Feb 19 19:02:38 2016
New Revision: 1731283
URL: http://svn.apache.org/viewvc?rev=1731283&view=rev
Log:
Deprecate in preparation for removal
Modified:
tomcat/trunk/java/org/apache/tomcat/util/scan/Constants.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/scan/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/Constants.java?rev=1731283&r1=1731282&r2=1731283&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/scan/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/Constants.java Fri Feb 19
19:02:38 2016
@@ -35,7 +35,10 @@ public final class Constants {
public static final String WEB_INF_LIB = "/WEB-INF/lib/";
public static final String WEB_INF_CLASSES = "/WEB-INF/classes";
-/* Context attributes - used to pass short-cuts to Jasper */
+/* Context attributes */
+@Deprecated // Third party components should use standard Servlet API
+// mechanisms such as a ServletContainerInitializer to access
+// configuration information
public static final String MERGED_WEB_XML =
"org.apache.tomcat.util.scan.MergedWebXml";
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/1090 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1731281 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: r1731281 - /tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Author: markt
Date: Fri Feb 19 18:24:52 2016
New Revision: 1731281
URL: http://svn.apache.org/viewvc?rev=1731281&view=rev
Log:
Correct name after r1731275
Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1731281&r1=1731280&r2=1731281&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Fri
Feb 19 18:24:52 2016
@@ -112,7 +112,7 @@ public final class SecurityClassLoad {
final String basePackage = "org.apache.catalina.loader.";
loader.loadClass
(basePackage +
- "WebappClassLoaderBase$PrivilegedFindResourceByName");
+ "WebappClassLoaderBase$PrivilegedFindClassByName");
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1731279 - /tomcat/trunk/test/org/apache/catalina/startup/TestTomcatClassLoader.java
Author: markt
Date: Fri Feb 19 17:59:05 2016
New Revision: 1731279
URL: http://svn.apache.org/viewvc?rev=1731279&view=rev
Log:
Make the tests implementation neutral (as long as it extends
WebappClassLoaderBase)
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestTomcatClassLoader.java
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestTomcatClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcatClassLoader.java?rev=1731279&r1=1731278&r2=1731279&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcatClassLoader.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcatClassLoader.java
Fri Feb 19 17:59:05 2016
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertEqu
import org.junit.Test;
import org.apache.catalina.Context;
-import org.apache.catalina.loader.WebappClassLoader;
+import org.apache.catalina.loader.WebappClassLoaderBase;
import org.apache.tomcat.util.buf.ByteChunk;
public class TestTomcatClassLoader extends TomcatBaseTest {
@@ -98,7 +98,7 @@ public class TestTomcatClassLoader exten
out.print("SYSTEM,");
} else if (custom == cl) {
out.print("CUSTOM,");
-} else if (cl instanceof WebappClassLoader) {
+} else if (cl instanceof WebappClassLoaderBase) {
out.print("WEBAPP,");
} else {
out.print("OTHER,");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1731278 - /tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
Author: markt Date: Fri Feb 19 17:58:15 2016 New Revision: 1731278 URL: http://svn.apache.org/viewvc?rev=1731278&view=rev Log: Update for parallel class loader Modified: tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java Modified: tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java?rev=1731278&r1=1731277&r2=1731278&view=diff == --- tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java (original) +++ tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java Fri Feb 19 17:58:15 2016 @@ -117,7 +117,7 @@ public class TestRegistration extends To ",name=NonLoginAuthenticator", "Tomcat:type=Valve,host=" + host + ",context=" + context + ",name=StandardContextValve", -"Tomcat:type=WebappClassLoader,host=" + host + ",context=" + context, +"Tomcat:type=ParallelWebappClassLoader,host=" + host + ",context=" + context, "Tomcat:type=WebResourceRoot,host=" + host + ",context=" + context, "Tomcat:type=WebResourceRoot,host=" + host + ",context=" + context + ",name=Cache", - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1731277 - /tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
Author: markt
Date: Fri Feb 19 17:57:26 2016
New Revision: 1731277
URL: http://svn.apache.org/viewvc?rev=1731277&view=rev
Log:
Make the tests implementation neutral (as long as it extends
WebappClassLoaderBase)
Modified:
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
Modified:
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java?rev=1731277&r1=1731276&r2=1731277&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
Fri Feb 19 17:57:26 2016
@@ -27,6 +27,7 @@ import java.security.ProtectionDomain;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.After;
@@ -69,7 +70,7 @@ public class TestWebappClassLoaderWeavin
private Tomcat tomcat;
private Context context;
-private WebappClassLoader loader;
+private WebappClassLoaderBase loader;
@Before
@Override
@@ -83,9 +84,9 @@ public class TestWebappClassLoaderWeavin
ClassLoader loader = this.context.getLoader().getClassLoader();
assertNotNull("The class loader should not be null.", loader);
-assertSame("The class loader is not correct.",
WebappClassLoader.class, loader.getClass());
+assertTrue("The class loader is not correct.", loader instanceof
WebappClassLoaderBase);
-this.loader = (WebappClassLoader) loader;
+this.loader = (WebappClassLoaderBase) loader;
}
@@ -250,7 +251,7 @@ public class TestWebappClassLoaderWeavin
result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass");
assertEquals("The second result is not correct.", "Hello, Weaver #2!",
result);
-WebappClassLoader copiedLoader = this.loader.copyWithoutTransformers();
+WebappClassLoaderBase copiedLoader = (WebappClassLoaderBase)
this.loader.copyWithoutTransformers();
result = invokeDoMethodOnClass(copiedLoader, "TesterNeverWeavedClass");
assertEquals("The third result is not correct.", "This will never be
weaved.", result);
@@ -299,7 +300,7 @@ public class TestWebappClassLoaderWeavin
}
}
-private static String invokeDoMethodOnClass(WebappClassLoader loader,
String className)
+private static String invokeDoMethodOnClass(WebappClassLoaderBase loader,
String className)
throws Exception {
Class c = loader.findClass("org.apache.catalina.loader." +
className);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-nio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Timed Out'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-nio : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build timed out -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 1 hour 1 sec Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160219-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160219.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160219-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20160219/bin/op enssl -Dexecute.test.bio=false -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/1087 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1731273 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
svn commit: r1731275 - in /tomcat/trunk/java/org/apache/catalina: loader/ResourceEntry.java loader/WebappClassLoaderBase.java webresources/Cache.java webresources/FileResource.java
Author: markt
Date: Fri Feb 19 17:09:35 2016
New Revision: 1731275
URL: http://svn.apache.org/viewvc?rev=1731275&view=rev
Log:
Refactoring to reduce the impact on the memory footprint of the resource cache
within the web application class loader.
Main changes:
- WebResources caches everything apart from classes
- WebResources is responsible for EBCDIC conversion for properties files
- The class loader cache now only caches the last modified time of any resource
loaded through the class loader and loaded classes.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/ResourceEntry.java
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/ResourceEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/ResourceEntry.java?rev=1731275&r1=1731274&r2=1731275&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/ResourceEntry.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/ResourceEntry.java Fri Feb 19
17:09:35 2016
@@ -16,10 +16,6 @@
*/
package org.apache.catalina.loader;
-import java.net.URL;
-
-import org.apache.catalina.WebResource;
-
/**
* Resource entry.
*
@@ -27,32 +23,16 @@ import org.apache.catalina.WebResource;
*/
public class ResourceEntry {
-
/**
- * The "last modified" time of the origin file at the time this class
+ * The "last modified" time of the origin file at the time this resource
* was loaded, in milliseconds since the epoch.
*/
public long lastModified = -1;
/**
- * Binary content of the resource.
- */
-public byte[] binaryContent = null;
-
-
-/**
* Loaded class.
*/
public volatile Class loadedClass = null;
-
-
-/**
- * URL source from where the object was loaded.
- */
-public URL source = null;
-
-
-public WebResource webResource = null;
}
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1731275&r1=1731274&r2=1731275&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Fri
Feb 19 17:09:35 2016
@@ -16,7 +16,6 @@
*/
package org.apache.catalina.loader;
-import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FilePermission;
import java.io.IOException;
@@ -32,7 +31,6 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
-import java.nio.charset.StandardCharsets;
import java.security.AccessControlException;
import java.security.AccessController;
import java.security.CodeSource;
@@ -139,7 +137,6 @@ public abstract class WebappClassLoaderB
private static final String JVM_THREAD_GROUP_SYSTEM = "system";
private static final String CLASS_FILE_SUFFIX = ".class";
-private static final String SERVICES_PREFIX = "/META-INF/services/";
static {
ClassLoader.registerAsParallelCapable();
@@ -147,20 +144,18 @@ public abstract class WebappClassLoaderB
JVM_THREAD_GROUP_NAMES.add("RMI Runtime");
}
-protected class PrivilegedFindResourceByName
-implements PrivilegedAction {
+protected class PrivilegedFindClassByName
+implements PrivilegedAction> {
protected final String name;
-protected final String path;
-PrivilegedFindResourceByName(String name, String path) {
+PrivilegedFindClassByName(String name) {
this.name = name;
-this.path = path;
}
@Override
-public ResourceEntry run() {
-return findResourceInternal(name, path);
+public Class run() {
+return findClassInternal(name);
}
}
@@ -327,12 +322,6 @@ public abstract class WebappClassLoaderB
/**
- * need conversion for properties files
- */
-protected boolean needConvert = false;
-
-
-/**
* All permission.
*/
protected final Permission allPermission = new
java.security.AllPermission();
@@ -688,7 +677,6 @@ public abstract class WebappClassLoaderB
base.resources = this.resources;
base.delegate = this.delegate;
base.state = LifecycleState.NEW;
-base.needConvert = this.needConvert;
base.clearReferencesStatic = this.clearReferencesStatic;
base.clearReferencesStopThreads = this.clearReferencesStopThreads;
base.clearReferencesStopTimerThreads =
this.clearReferencesStopT
svn commit: r1731273 - in /tomcat/trunk: java/org/apache/catalina/loader/WebappLoader.java webapps/docs/changelog.xml webapps/docs/config/loader.xml
Author: markt Date: Fri Feb 19 17:01:58 2016 New Revision: 1731273 URL: http://svn.apache.org/viewvc?rev=1731273&view=rev Log: Switch to parallel web application class loading by default. Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java tomcat/trunk/webapps/docs/changelog.xml tomcat/trunk/webapps/docs/config/loader.xml Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1731273&r1=1731272&r2=1731273&view=diff == --- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original) +++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Fri Feb 19 17:01:58 2016 @@ -114,7 +114,7 @@ public class WebappLoader extends Lifecy * This class should extend WebappClassLoaderBase, otherwise, a different * loader implementation must be used. */ -private String loaderClass = WebappClassLoader.class.getName(); +private String loaderClass = ParallelWebappClassLoader.class.getName(); /** Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1731273&r1=1731272&r2=1731273&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Fri Feb 19 17:01:58 2016 @@ -99,6 +99,10 @@ modified Context configuration parameters and reduces (slightly) the memory footprint of a running Tomcat instance. (markt) + +Switch to the web application class loader to the +ParallelWebappClassLoader by default. (markt) + Modified: tomcat/trunk/webapps/docs/config/loader.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/loader.xml?rev=1731273&r1=1731272&r2=1731273&view=diff == --- tomcat/trunk/webapps/docs/config/loader.xml (original) +++ tomcat/trunk/webapps/docs/config/loader.xml Fri Feb 19 17:01:58 2016 @@ -127,12 +127,12 @@ If not specified, the default value is -org.apache.catalina.loader.WebappClassLoader. The -default loaderClass is not parallel capable, which -means that loading a class from this classloader is performed by one -thread at a time. A parallel capable loaderClass is -available and can be used by specifying -org.apache.catalina.loader.ParallelWebappClassLoader. +org.apache.catalina.loader.ParallelWebappClassLoader. The +default loaderClass is parallel capable, which +means that mutltiple threads may load difference classes in parallel. +A non-parallel capable loaderClass is available and can +be used by specifying +org.apache.catalina.loader.WebappClassLoader. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57130] Allow digest.sh to accept password from a file or from stdin
https://bz.apache.org/bugzilla/show_bug.cgi?id=57130 csutherl changed: What|Removed |Added CC||csuth...@redhat.com --- Comment #2 from csutherl --- Created attachment 33572 --> https://bz.apache.org/bugzilla/attachment.cgi?id=33572&action=edit Patch proposal I think that I added the requirements correctly :) I had a little trouble understanding exactly what option 3 (the -- addition) was asking, so I did what other CLI tools do. Additionally, I made the password-file option ignore other password input, which can easily be reversed if that behavior was undesired. The documentation may need some touching up to incorporate the file option also (I added the option in the realm-howto explanation, but didn't amend the example use-case). Lastly, I put in some comments to help understand my intention in case they were incorrect. Those can be cleaned up if the logic is agreed upon. -- 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: r1731254 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Author: markt
Date: Fri Feb 19 15:09:58 2016
New Revision: 1731254
URL: http://svn.apache.org/viewvc?rev=1731254&view=rev
Log:
Simplify
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1731254&r1=1731253&r2=1731254&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Fri
Feb 19 15:09:58 2016
@@ -2553,14 +2553,12 @@ public abstract class WebappClassLoaderB
return null;
}
-WebResource resource = null;
-
ResourceEntry entry = resourceEntries.get(path);
if (entry != null) {
return entry;
}
-resource = resources.getClassLoaderResource(path);
+WebResource resource = resources.getClassLoaderResource(path);
if (!resource.exists()) {
return null;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1731247 - in /tomcat/trunk: java/org/apache/tomcat/util/net/openssl/ webapps/docs/
Author: remm
Date: Fri Feb 19 14:27:05 2016
New Revision: 1731247
URL: http://svn.apache.org/viewvc?rev=1731247&view=rev
Log:
Remove class hierarchy complexity (no client mode), and pass the JSSE session
options to OpenSSL.
Removed:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLServerSessionContext.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLSessionContext.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1731247&r1=1731246&r2=1731247&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Fri Feb 19 14:27:05 2016
@@ -63,7 +63,7 @@ public class OpenSSLContext implements o
private final SSLHostConfig sslHostConfig;
private final SSLHostConfigCertificate certificate;
-private OpenSSLServerSessionContext sessionContext;
+private OpenSSLSessionContext sessionContext;
private final List negotiableProtocols;
@@ -373,7 +373,7 @@ public class OpenSSLContext implements o
SSLContext.setNpnProtos(ctx, protocolsArray,
SSL.SSL_SELECTOR_FAILURE_NO_ADVERTISE);
}
-sessionContext = new OpenSSLServerSessionContext(ctx);
+sessionContext = new OpenSSLSessionContext(ctx);
sslHostConfig.setOpenSslContext(Long.valueOf(ctx));
initialized = true;
} catch (Exception e) {
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLSessionContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLSessionContext.java?rev=1731247&r1=1731246&r2=1731247&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLSessionContext.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLSessionContext.java
Fri Feb 19 14:27:05 2016
@@ -22,18 +22,19 @@ import java.util.NoSuchElementException;
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSessionContext;
+import org.apache.tomcat.jni.SSL;
import org.apache.tomcat.jni.SSLContext;
import org.apache.tomcat.util.res.StringManager;
/**
* OpenSSL specific {@link SSLSessionContext} implementation.
*/
-public abstract class OpenSSLSessionContext implements SSLSessionContext {
+public class OpenSSLSessionContext implements SSLSessionContext {
private static final StringManager sm =
StringManager.getManager(OpenSSLSessionContext.class);
private static final Enumeration EMPTY = new EmptyEnumeration();
private final OpenSSLSessionStats stats;
-final long context;
+private final long context;
OpenSSLSessionContext(long context) {
this.context = context;
@@ -67,13 +68,18 @@ public abstract class OpenSSLSessionCont
*
* @param enabled {@code true} to enable caching, {@code false} to disable
*/
-public abstract void setSessionCacheEnabled(boolean enabled);
+public void setSessionCacheEnabled(boolean enabled) {
+long mode = enabled ? SSL.SSL_SESS_CACHE_SERVER :
SSL.SSL_SESS_CACHE_OFF;
+SSLContext.setSessionCacheMode(context, mode);
+}
/**
* @return {@code true} if caching of SSL sessions is enabled, {@code
false}
* otherwise.
*/
-public abstract boolean isSessionCacheEnabled();
+public boolean isSessionCacheEnabled() {
+return SSLContext.getSessionCacheMode(context) ==
SSL.SSL_SESS_CACHE_SERVER;
+}
/**
* @return The statistics for this context.
@@ -82,6 +88,45 @@ public abstract class OpenSSLSessionCont
return stats;
}
+@Override
+public void setSessionTimeout(int seconds) {
+if (seconds < 0) {
+throw new IllegalArgumentException();
+}
+SSLContext.setSessionCacheTimeout(context, seconds);
+}
+
+@Override
+public int getSessionTimeout() {
+return (int) SSLContext.getSessionCacheTimeout(context);
+}
+
+@Override
+public void setSessionCacheSize(int size) {
+if (size < 0) {
+throw new IllegalArgumentException();
+}
+SSLContext.setSessionCacheSize(context, size);
+}
+
+@Override
+public int getSessionCacheSize() {
+return (int) SSLContext.getSessionCacheSize(context);
+}
+
+/**
+ * Set the context within which session be reused (server side only)
+ * See http://www.openssl.org/docs/ssl/SS
svn commit: r1731246 - in /tomcat/trunk/java/org/apache/catalina/webresources: AbstractResource.java AbstractResourceSet.java Cache.java Constants.java StandardRoot.java
Author: markt
Date: Fri Feb 19 14:05:21 2016
New Revision: 1731246
URL: http://svn.apache.org/viewvc?rev=1731246&view=rev
Log:
Simplify
Removed:
tomcat/trunk/java/org/apache/catalina/webresources/Constants.java
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractResource.java
tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractResource.java?rev=1731246&r1=1731245&r2=1731246&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/AbstractResource.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/AbstractResource.java
Fri Feb 19 14:05:21 2016
@@ -27,8 +27,7 @@ import org.apache.tomcat.util.res.String
public abstract class AbstractResource implements WebResource {
-protected static final StringManager sm =
-StringManager.getManager(Constants.Package);
+protected static final StringManager sm =
StringManager.getManager(AbstractResource.class);
private final WebResourceRoot root;
private final String webAppPath;
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java?rev=1731246&r1=1731245&r2=1731246&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
Fri Feb 19 14:05:21 2016
@@ -37,8 +37,7 @@ public abstract class AbstractResourceSe
private Manifest manifest;
-protected static final StringManager sm =
-StringManager.getManager(Constants.Package);
+protected static final StringManager sm =
StringManager.getManager(AbstractResourceSet.class);
protected final void checkPath(String path) {
Modified: tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/Cache.java?rev=1731246&r1=1731245&r2=1731246&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/Cache.java (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/Cache.java Fri Feb 19
14:05:21 2016
@@ -31,8 +31,7 @@ import org.apache.tomcat.util.res.String
public class Cache {
private static final Log log = LogFactory.getLog(Cache.class);
-protected static final StringManager sm =
-StringManager.getManager(Constants.Package);
+protected static final StringManager sm =
StringManager.getManager(Cache.class);
private static final long TARGET_FREE_PERCENT_GET = 5;
private static final long TARGET_FREE_PERCENT_BACKGROUND = 10;
Modified: tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1731246&r1=1731245&r2=1731246&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java Fri
Feb 19 14:05:21 2016
@@ -62,8 +62,7 @@ import org.apache.tomcat.util.res.String
public class StandardRoot extends LifecycleMBeanBase implements
WebResourceRoot {
private static final Log log = LogFactory.getLog(StandardRoot.class);
-protected static final StringManager sm =
-StringManager.getManager(Constants.Package);
+protected static final StringManager sm =
StringManager.getManager(StandardRoot.class);
private Context context;
private boolean allowLinking = false;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1731235 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Author: markt
Date: Fri Feb 19 12:25:58 2016
New Revision: 1731235
URL: http://svn.apache.org/viewvc?rev=1731235&view=rev
Log:
Correctly set the state if the encoding can't be read
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1731235&r1=1731234&r2=1731235&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Fri
Feb 19 12:25:58 2016
@@ -1467,14 +1467,13 @@ public abstract class WebappClassLoaderB
state = LifecycleState.STARTING;
-String encoding = null;
try {
-encoding = System.getProperty("file.encoding");
+String encoding = System.getProperty("file.encoding");
+if (encoding.indexOf("EBCDIC") != -1) {
+needConvert = true;
+}
} catch (SecurityException e) {
-return;
-}
-if (encoding.indexOf("EBCDIC")!=-1) {
-needConvert = true;
+// Ignore
}
state = LifecycleState.STARTED;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58721] Http11Nio2Protocol is leaking open file handles for TCP connections
https://bz.apache.org/bugzilla/show_bug.cgi?id=58721 --- Comment #4 from Remy Maucherat --- Since apparently you don't have additional reproduction information on this, it could be worthwhile to test 9 M3. -- 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: r1731216 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml
Author: markt
Date: Fri Feb 19 10:23:42 2016
New Revision: 1731216
URL: http://svn.apache.org/viewvc?rev=1731216&view=rev
Log:
Refactor the web.xml parsing so a new parser is created every time the web
application starts rather than creating and caching the parser when the Context
is created. This enables the parser to take account of modified Context
configuration parameters and reduces (slightly) the memory footprint of a
running Tomcat instance.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1731216&r1=1731215&r2=1731216&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Fri Feb 19
10:23:42 2016
@@ -241,8 +241,6 @@ public class ContextConfig implements Li
*/
protected boolean handlesTypesNonAnnotations = false;
-private WebXmlParser webXmlParser;
-
// - Properties
@@ -741,9 +739,6 @@ public class ContextConfig implements Li
ok = true;
contextConfig(contextDigester);
-
-webXmlParser = new WebXmlParser(context.getXmlNamespaceAware(),
-context.getXmlValidation(), context.getXmlBlockExternal());
}
@@ -1109,8 +1104,11 @@ public class ContextConfig implements Li
* those in JARs excluded from an absolute ordering) need to be
* scanned to check if they match.
*/
+WebXmlParser webXmlParser = new
WebXmlParser(context.getXmlNamespaceAware(),
+context.getXmlValidation(), context.getXmlBlockExternal());
+
Set defaults = new HashSet<>();
-defaults.add(getDefaultWebXmlFragment());
+defaults.add(getDefaultWebXmlFragment(webXmlParser));
WebXml webXml = createWebXml();
@@ -1128,7 +1126,7 @@ public class ContextConfig implements Li
// provided by the container. If any of the application JARs have a
// web-fragment.xml it will be parsed at this point. web-fragment.xml
// files are ignored for container provided JARs.
-Map fragments = processJarsForWebFragments(webXml);
+Map fragments = processJarsForWebFragments(webXml,
webXmlParser);
// Step 2. Order the fragments.
Set orderedFragments = null;
@@ -1456,7 +1454,7 @@ public class ContextConfig implements Li
}
-private WebXml getDefaultWebXmlFragment() {
+private WebXml getDefaultWebXmlFragment(WebXmlParser webXmlParser) {
// Host should never be null
Host host = (Host) context.getParent();
@@ -1877,9 +1875,11 @@ public class ContextConfig implements Li
* known not contain fragments will be skipped.
*
* @param application The main web.xml metadata
+ * @param webXmlParser The parser to use to process the web.xml file
* @return A map of JAR name to processed web fragment (if any)
*/
-protected Map processJarsForWebFragments(WebXml
application) {
+protected Map processJarsForWebFragments(WebXml application,
+WebXmlParser webXmlParser) {
JarScanner jarScanner = context.getJarScanner();
boolean delegate = false;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1731216&r1=1731215&r2=1731216&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Feb 19 10:23:42 2016
@@ -92,6 +92,13 @@
Refactor the JAR and JAR-in-WAR resource handling to reduce the memory
footprint of the web application. (markt)
+
+Refactor the web.xml parsing so a new parser is created every time the
+web application starts rather than creating and caching the parser when
+the Context is created. This enables the parser to take account of
+modified Context configuration parameters and reduces (slightly) the
+memory footprint of a running Tomcat instance. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58244] two way SSL loses client certificate after a few requests
https://bz.apache.org/bugzilla/show_bug.cgi?id=58244 --- Comment #15 from Remy Maucherat --- Ok, that sounds hard. The new OpenSSL code should avoid the problem in most cases since the certificates are cached in the SSL engine. -- 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 57736] changes from Tomcat 7 to Tomcat 8 causing problems
https://bz.apache.org/bugzilla/show_bug.cgi?id=57736 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEEDINFO|RESOLVED --- Comment #15 from Mark Thomas --- No further information provided. If you still observe the problem described in comment #12 then please create a new issue and provide a test case that can be used to reproduce the problem. -- 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 59031] Tomcat 8 uninstaller entres a symbolic link and deletes its contents
https://bz.apache.org/bugzilla/show_bug.cgi?id=59031 --- Comment #3 from Birger Skogeng Pedersen --- (In reply to Mark Thomas from comment #1) > Which operating system was this on? Windows 10 -- 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 59031] Tomcat 8 uninstaller entres a symbolic link and deletes its contents
https://bz.apache.org/bugzilla/show_bug.cgi?id=59031 --- Comment #2 from Birger Skogeng Pedersen --- Windows 10 -- 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 59031] Tomcat 8 uninstaller entres a symbolic link and deletes its contents
https://bz.apache.org/bugzilla/show_bug.cgi?id=59031 Mark Thomas changed: What|Removed |Added OS||All --- Comment #1 from Mark Thomas --- Which operating system was this on? -- 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 59010] Disabling socketBuffer with "-1" doesn't cause exception on linux
https://bz.apache.org/bugzilla/show_bug.cgi?id=59010 --- Comment #3 from Rashmi --- So to clarify further, when we set socketBuffer to "-1" and if the client disconnects before the server responds, what is the expected behaviour? Is it that a socket error exception must be seen like on windows or the server silently attempt to send response and not throw an error if that's not possible like on linux? The socket error thrown on windows is very useful on server side as we know that there was an error sending response as the client disconnected. Is there any other way we can make the server log the error when client disconnects other than setting socketBuffer to "-1" -- 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
