Re: Cloud clustering support using Kubernetes
On Thu, Oct 4, 2018 at 7:29 PM Rémy Maucherat wrote: > Ok ! For now I switched to openjson, since it's the same nonsense API as > the other one (so no retesting needed for now), without the "no evil" > clause. I had read the org.json license actually and thought the evil > clause was just for fun, but I guess lawyers aren't amused. > I did more updates. I should now be able to add it to Tomcat, as package "org.apache.catalina.tribes.membership.cloud". I'll add a compile time dependency on openjson for now (since it's the easiest thing to do), but I won't add it to the build for now (this way it is still possible to switch). Rémy
svn commit: r1843123 - /tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
Author: markt
Date: Mon Oct 8 09:48:12 2018
New Revision: 1843123
URL: http://svn.apache.org/viewvc?rev=1843123&view=rev
Log:
Add additional option required in back-ported tests for 8.5.x as the default
for allowHostHeaderMismatch is true in 8.5.x.
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java?rev=1843123&r1=1843122&r2=1843123&view=diff
==
--- tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
Mon Oct 8 09:48:12 2018
@@ -1226,6 +1226,8 @@ public class TestHttp11Processor extends
// request
tomcat.getConnector().setAttribute("maxKeepAliveRequests", "1");
+tomcat.getConnector().setAttribute("allowHostHeaderMismatch", "false");
+
// No file system docBase required
Context ctx = tomcat.addContext("", null);
@@ -1263,6 +1265,8 @@ public class TestHttp11Processor extends
// request
tomcat.getConnector().setAttribute("maxKeepAliveRequests", "1");
+tomcat.getConnector().setAttribute("allowHostHeaderMismatch", "false");
+
// No file system docBase required
Context ctx = tomcat.addContext("", null);
@@ -1300,6 +1304,8 @@ public class TestHttp11Processor extends
// request
tomcat.getConnector().setAttribute("maxKeepAliveRequests", "1");
+tomcat.getConnector().setAttribute("allowHostHeaderMismatch", "false");
+
// No file system docBase required
Context ctx = tomcat.addContext("", null);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1842849 - in /tomcat/trunk: java/org/apache/tomcat/jni/Library.java test/org/apache/tomcat/util/net/TesterSupport.java test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
On 05/10/18 19:46, Christopher Schultz wrote:
> Mark,
>
> On 10/5/18 06:22, Mark Thomas wrote:
>> On 05/10/18 10:42, Rémy Maucherat wrote:
>>> On Fri, Oct 5, 2018 at 11:40 AM Mark Thomas
>>> wrote:
>>>
On 04/10/18 22:07, isa...@apache.org wrote:
> Author: isapir Date: Thu Oct 4 21:07:54 2018 New Revision:
> 1842849
>
> URL: http://svn.apache.org/viewvc?rev=1842849&view=rev Log:
> System.load() expects absolute path.
Remember to consider whether or not any changes you make to
trunk should be back-ported to 8.5.x and 7.0.x. Generally,
changes are back-ported unless they require changing a public
API (as defined in RELEASE-NOTES) or are considering likely to
cause a regression.
> Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf
> .java
>
> URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/uti
> l/net/openssl/TestOpenSSLConf.java?rev=1842849&r1=1842848&r2=1842849&vie
> w=diff
>
>
> ==
> ---
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf
> .java
> (original)
> +++
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf
> .java
> Thu Oct 4 21:07:54 2018
> @@ -87,7 +87,11 @@ public class TestOpenSSLConf extends Tom
>
> @Test public void testOpenSSLConfCmdCipher() throws Exception
> { -log.info("Found OpenSSL version 0x" +
Integer.toHexString(OPENSSL_VERSION));
> +if (TesterSupport.isOpensslAvailable()) +
> log.info("Found OpenSSL version 0x" +
Integer.toHexString(OPENSSL_VERSION));
> +else +log.warn("OpenSSL not found: " +
TesterSupport.OPENSSL_ERROR);
> +
The Tomcat style is to always use { and } even for one line for
clarity.
Due to the age of the code base, there are a mix of styles.
Generally, we try and move code towards the currently accepted
style as we change it.
>>>
>>> +1 a lack of { } is too big a possible bug source to ignore.
>
>> I just tried enabling the CheckStyle test for this. There were
>> just under three thousand errors.
>
>> I'm wondering if it is worth going through the code base fixing
>> these.
>
> I'm nearly -1 on this, mostly because it will make back-porting stuff
> a total PITA.
Fair enough. I don't need much convincing not to do it as I have plenty
of other stuff on my TODO list.
> Definitely opportunistically "upgrade" code we find here and there,
> but I don't think it's worth taking a day or two to add missing
> explicit blocks everywhere.
ACK.
>> On a related topic, I did notice several instance of the
>> following:
>
>> if (a == b) ... if (a == c) ... if (a == d) ...
>
>> that could be more efficiently written as:
>
>> if (a == b) { ... } else if (a == c) { ... } else if (a == d) {
>> ... }
>
> That would be nice. Sounds like a BZ issue that could have a
> "beginner" keyword attached.
Good idea. Feel free to add that if I don't get there first.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release JK 1.2.46
PING. We need at least one more binding +1 for this release. Mark On 01/10/18 16:30, Mark Thomas wrote: > Tag: > http://svn.apache.org/viewvc/tomcat/jk/tags/JK_1_2_46/ > > Source: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/jk/ > > > This is a maintenance release with a handful of bug fixes (compared to > 1.2.44) and some clean-up. It also includes Windows binaries for IIS. > > > The proposed JK 1.2.46 release is: > [ ] Broken - do not release > [ ] Stable - go ahead and release as 1.2.46 > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: SVN Workflow and Backporting
On 06/10/18 23:08, Igal Sapir wrote: > I am rather new to SVN, and actually use it mostly via GIT, i.e. `git svn > rebase` and `git svn dcommit`. > > What is the best way to backport specific patches from trunk to 8.5, 7.0, > etc.? Patch utility? SVN Merge? GIT cherry-pick (though the git mirrors > have a separate repos which adds some complexity I think) > > I'd appreciate any tips that will point me in the right direction, or if > anyone can share their workflow. I use svn for backports. I use the following scripts. The first to merge from trunk to 8.5.x, the second to merge from 8.5.x to 7.0.x. I `cd` into the root of the repo for the version I want to merge to and then call the script with the revision of the commit I want to back-port. HTH, Mark mark@study04:~/bin$ cat tc-merge.sh #!/bin/sh svn up svn merge -c $1 https://svn.apache.org/repos/asf/tomcat/trunk mark@study04:~/bin$ cat tc85-merge.sh #!/bin/sh svn up svn merge -c $1 https://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk > > Thanks, > > Igal > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1843124 - /tomcat/trunk/java/javax/el/StaticFieldELResolver.java
Author: markt
Date: Mon Oct 8 10:06:55 2018
New Revision: 1843124
URL: http://svn.apache.org/viewvc?rev=1843124&view=rev
Log:
Trivial commit to test CI
Modified:
tomcat/trunk/java/javax/el/StaticFieldELResolver.java
Modified: tomcat/trunk/java/javax/el/StaticFieldELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/StaticFieldELResolver.java?rev=1843124&r1=1843123&r2=1843124&view=diff
==
--- tomcat/trunk/java/javax/el/StaticFieldELResolver.java (original)
+++ tomcat/trunk/java/javax/el/StaticFieldELResolver.java Mon Oct 8 10:06:55
2018
@@ -47,8 +47,8 @@ public class StaticFieldELResolver exten
Modifier.isPublic(modifiers)) {
return field.get(null);
}
-} catch (IllegalArgumentException | IllegalAccessException
-| NoSuchFieldException | SecurityException e) {
+} catch (IllegalArgumentException | IllegalAccessException |
+NoSuchFieldException | SecurityException e) {
exception = e;
}
String msg = Util.message(context,
"staticFieldELResolver.notFound",
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1843126 - /tomcat/trunk/java/javax/el/Util.java
Author: markt
Date: Mon Oct 8 10:22:14 2018
New Revision: 1843126
URL: http://svn.apache.org/viewvc?rev=1843126&view=rev
Log:
Trivial commit to test CI
Modified:
tomcat/trunk/java/javax/el/Util.java
Modified: tomcat/trunk/java/javax/el/Util.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/Util.java?rev=1843126&r1=1843125&r2=1843126&view=diff
==
--- tomcat/trunk/java/javax/el/Util.java (original)
+++ tomcat/trunk/java/javax/el/Util.java Mon Oct 8 10:22:14 2018
@@ -811,25 +811,21 @@ class Util {
@Override
public boolean equals(Object o)
{
-return o == this
-|| (null != o
-&& this.getClass().equals(o.getClass())
-&& ((MatchResult)o).getExact() == this.getExact()
-&& ((MatchResult)o).getAssignable() == this.getAssignable()
-&& ((MatchResult)o).getCoercible() == this.getCoercible()
-&& ((MatchResult)o).isBridge() == this.isBridge()
-)
-;
+return o == this || (null != o &&
+this.getClass().equals(o.getClass()) &&
+((MatchResult)o).getExact() == this.getExact() &&
+((MatchResult)o).getAssignable() == this.getAssignable() &&
+((MatchResult)o).getCoercible() == this.getCoercible() &&
+((MatchResult)o).isBridge() == this.isBridge());
}
@Override
public int hashCode()
{
-return (this.isBridge() ? 1 << 24 : 0)
-^ this.getExact() << 16
-^ this.getAssignable() << 8
-^ this.getCoercible()
-;
+return (this.isBridge() ? 1 << 24 : 0) ^
+this.getExact() << 16 ^
+this.getAssignable() << 8 ^
+this.getCoercible();
}
}
-
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/3628 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] 1843126 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62786] Post Resources ignored in server.xml when Resources tag present in context.xml
https://bz.apache.org/bugzilla/show_bug.cgi?id=62786 Mark Thomas changed: What|Removed |Added OS||All --- Comment #1 from Mark Thomas --- I've confirmed the described behaviour with trunk (9.0.x) and I agree that expecting the same behaviour when the Context is defined in server.xml and in a separate file is a reasonable expectation. Next up is looking into why this is. -- 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 62786] Post Resources ignored in server.xml when Resources tag present in context.xml
https://bz.apache.org/bugzilla/show_bug.cgi?id=62786 --- Comment #2 from Mark Thomas --- When a Context is defined in a dedicated file the order of events is: a) Create Context object b) configure from conf/context.xml c) update configuration from dedicated file When a Context is defined in server.xml the order of events is: 1) Create Context object 2) configure from server.xml 3) update configuration from conf/context.xml Ideally, we want to swap 2) and 3). Note: - b, c and 3 happen in ContextConfig - Defining Contexts in server.xml is strongly discouraged - This problem is not limited to Resources. It applies equally to any Context configuration. Re-ordering 2) and 3) is tricky as 1) and 2) happen in the digester while server.xml is being parsed. Changing the order is possible but would be very invasive. It is already possible to disable 3) by setting override="true" in the Context defined in server.xml (although that does mean all settings from conf/context.xml will be ignored). We could change the default of override for Context's defined in server.xml but I am concerned that that will break existing configurations. E.g. where resources are defined only in conf/context.xml to make common resources available to multiple web applications. I'm currently leaning towards addressing this issue with a documentation change. -- 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 62788] Add explicit ".encoding=UTF-8" to FileHandler configurations in logging.properties
https://bz.apache.org/bugzilla/show_bug.cgi?id=62788 Mark Thomas changed: What|Removed |Added OS||All --- Comment #1 from Mark Thomas --- +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
[Bug 62786] Post Resources ignored in server.xml when Resources tag present in context.xml
https://bz.apache.org/bugzilla/show_bug.cgi?id=62786 --- Comment #3 from Steeve Beroard --- Thank you for your quick feedback, we will follow this issue. -- 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: r1843142 - in /tomcat/trunk: java/org/apache/tomcat/util/net/LocalStrings.properties java/org/apache/tomcat/util/net/SecureNioChannel.java webapps/docs/changelog.xml
Author: markt
Date: Mon Oct 8 13:48:30 2018
New Revision: 1843142
URL: http://svn.apache.org/viewvc?rev=1843142&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62791
Remove an unnecessary check in the NIO TLS implementation that prevented from
secure WebSocket connections from being established.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1843142&r1=1843141&r2=1843142&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
[UTF-8] Mon Oct 8 13:48:30 2018
@@ -120,7 +120,6 @@ channel.nio.ssl.wrapException=Handshake
channel.nio.ssl.wrapFail=Unable to wrap data, invalid status [{0}]
channel.nio.ssl.incompleteHandshake=Handshake incomplete, you must complete
handshake before reading data.
channel.nio.ssl.closing=Channel is in closing state.
-channel.nio.ssl.invalidBuffer=You can only read using the application read
buffer provided by the handler.
channel.nio.ssl.expandNetInBuffer=Expanding network input buffer to [{0}] bytes
channel.nio.ssl.expandNetOutBuffer=Expanding network output buffer to [{0}]
bytes
channel.nio.ssl.sniDefault=Unable to buffer enough data to determine requested
SNI host name. Using default
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1843142&r1=1843141&r2=1843142&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Mon Oct
8 13:48:30 2018
@@ -565,11 +565,6 @@ public class SecureNioChannel extends Ni
*/
@Override
public int read(ByteBuffer dst) throws IOException {
-// Make sure we only use the ApplicationBufferHandler's buffers
-if (dst != getBufHandler().getReadBuffer() && (getAppReadBufHandler()
== null
-|| dst != getAppReadBufHandler().getByteBuffer())) {
-throw new
IllegalArgumentException(sm.getString("channel.nio.ssl.invalidBuffer"));
-}
//are we in the middle of closing or closed?
if ( closing || closed) return -1;
//did we finish our handshake?
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1843142&r1=1843141&r2=1843142&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Oct 8 13:48:30 2018
@@ -118,6 +118,11 @@
Such requests are unusual but not invalid. Patch provided by Michael
Orr. (markt)
+
+62791: Remove an unnecessary check in the NIO TLS
+implementation that prevented from secure WebSocket connections from
+being established. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1843143 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/LocalStrings.properties java/org/apache/tomcat/util/net/SecureNioChannel.java webapps/docs/changelog.xml
Author: markt Date: Mon Oct 8 13:49:42 2018 New Revision: 1843143 URL: http://svn.apache.org/viewvc?rev=1843143&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62791 Remove an unnecessary check in the NIO TLS implementation that prevented from secure WebSocket connections from being established. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 8 13:49:42 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,176
svn commit: r1843144 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/SecureNioChannel.java webapps/docs/changelog.xml
Author: markt Date: Mon Oct 8 13:51:18 2018 New Revision: 1843144 URL: http://svn.apache.org/viewvc?rev=1843144&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62791 Remove an unnecessary check in the NIO TLS implementation that prevented from secure WebSocket connections from being established. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 8 13:51:18 2018 @@ -1,3 +1,3 @@ /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,1644525,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,1681703,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,1702 739,1702742,1702744,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,1715866,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,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281 4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,18
svn commit: r1843148 - in /tomcat/trunk: ./ java/org/apache/catalina/tribes/membership/cloud/ res/checkstyle/ webapps/docs/
Author: remm
Date: Mon Oct 8 14:09:16 2018
New Revision: 1843148
URL: http://svn.apache.org/viewvc?rev=1843148&view=rev
Log:
- Experimental Kubernetes aware cloud membership provider, based on code by
Maxime Beck.
- Contains code derived from jgroups.
- Documentation is hard and will be a wip.
- Requires openjson to run.
- Kube is usually available so it should provide wide support, but native
support for certain other orchestrators like Docker is a possibility.
Added:
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
(with props)
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java
(with props)
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
(with props)
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
(with props)
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/Constants.java
(with props)
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/InsecureStreamProvider.java
(with props)
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
(with props)
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties
(with props)
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/StreamProvider.java
(with props)
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/TokenStreamProvider.java
(with props)
Modified:
tomcat/trunk/NOTICE
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
tomcat/trunk/res/checkstyle/org-import-control.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/tomcat/trunk/NOTICE?rev=1843148&r1=1843147&r2=1843148&view=diff
==
--- tomcat/trunk/NOTICE (original)
+++ tomcat/trunk/NOTICE Mon Oct 8 14:09:16 2018
@@ -28,6 +28,12 @@ project developed at Twitter
* Copyright 2014 The Netty Project
* Copyright 2014 Twitter
+For portions of the Tomcat cloud support
+The org.apache.catalina.tribes.membership.cloud package contains derivative
+work originating from the jgroups project.
+https://github.com/jgroups-extras/jgroups-kubernetes
+Copyright 2018 Red Hat Inc.
+
The original XML Schemas for Java EE Deployment Descriptors:
- javaee_5.xsd
- javaee_web_services_1_2.xsd
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1843148&r1=1843147&r2=1843148&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Oct 8 14:09:16 2018
@@ -283,6 +283,15 @@ saaj-api.home=${base.path}/saaj-api-${sa
saaj-api.jar=${saaj-api.home}/saaj-api-${saaj-api.version}.jar
saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-api-${saaj-api.version}.jar
+# - OpenJSON, version 1.0.10 or later -
+openjson.version=1.0.10
+openjson.checksum.enabled=true
+openjson.checksum.algorithm=MD5|SHA-1
+openjson.checksum.value=c7c4cb9266cacc0aab5dcbb59456720c|8dcccbcc8bbfa15162cd7ca77bcf2b9daa90e70a
+openjson.home=${base.path}/openjson-${openjson.version}
+openjson.jar=${easymock.home}/openjson-${openjson.version}.jar
+openjson.loc=${base-maven.loc}/com/github/openjson/openjson/${openjson.version}/openjson-${openjson.version}.jar
+
# - bnd & bndlib, version 4.0.0 or later -
# - provides OSGI metadata for JARs -
bnd.version=4.0.0
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1843148&r1=1843147&r2=1843148&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Oct 8 14:09:16 2018
@@ -213,6 +213,7 @@
+
@@ -2717,7 +2718,17 @@ skip.installer property in build.propert
-
+
+
+
+
+
+
+
+
+
+
+
Added:
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java?rev=1843148&view=auto
==
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
(added)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
Mon Oct 8 14:09:16 2018
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license ag
svn commit: r1843150 - /tomcat/trunk/NOTICE
Author: remm Date: Mon Oct 8 14:17:52 2018 New Revision: 1843150 URL: http://svn.apache.org/viewvc?rev=1843150&view=rev Log: Improve notice. Modified: tomcat/trunk/NOTICE Modified: tomcat/trunk/NOTICE URL: http://svn.apache.org/viewvc/tomcat/trunk/NOTICE?rev=1843150&r1=1843149&r2=1843150&view=diff == --- tomcat/trunk/NOTICE (original) +++ tomcat/trunk/NOTICE Mon Oct 8 14:17:52 2018 @@ -10,6 +10,9 @@ developed by the Netty project and from finagle-native developed at Twitter (https://github.com/twitter/finagle). +This software contains code derived from jgroups-kubernetes +developed by the JGroups project (http://www.jgroups.org/). + The Windows Installer is built with the Nullsoft Scriptable Install System (NSIS), which is open source software. The original software and @@ -32,7 +35,7 @@ For portions of the Tomcat cloud support The org.apache.catalina.tribes.membership.cloud package contains derivative work originating from the jgroups project. https://github.com/jgroups-extras/jgroups-kubernetes -Copyright 2018 Red Hat Inc. +Copyright 2002-2018 Red Hat Inc. The original XML Schemas for Java EE Deployment Descriptors: - javaee_5.xsd - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62791] SecureNioChannel fails with "IllegalArgumentException: You can only read using the application read buffer provided by the handler."
https://bz.apache.org/bugzilla/show_bug.cgi?id=62791 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #6 from Mark Thomas --- Fixed in: - trunk for 9.0.13 onwards - 8.5.x for 8.5.35 onwards - 7.0.x for 7.0.92 onwards I'll look into what, if any, further clean-up is possible separately. -- 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: r1843154 - in /tomcat/trunk: build.properties.default java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java java/org/apache/catalina/tribes/membership/cloud/CloudMe
Author: remm
Date: Mon Oct 8 14:38:48 2018
New Revision: 1843154
URL: http://svn.apache.org/viewvc?rev=1843154&view=rev
Log:
Fix cut and paste issue, and two problems when renaming package.
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1843154&r1=1843153&r2=1843154&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Oct 8 14:38:48 2018
@@ -289,7 +289,7 @@ openjson.checksum.enabled=true
openjson.checksum.algorithm=MD5|SHA-1
openjson.checksum.value=c7c4cb9266cacc0aab5dcbb59456720c|8dcccbcc8bbfa15162cd7ca77bcf2b9daa90e70a
openjson.home=${base.path}/openjson-${openjson.version}
-openjson.jar=${easymock.home}/openjson-${openjson.version}.jar
+openjson.jar=${openjson.home}/openjson-${openjson.version}.jar
openjson.loc=${base-maven.loc}/com/github/openjson/openjson/${openjson.version}/openjson-${openjson.version}.jar
# - bnd & bndlib, version 4.0.0 or later -
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java?rev=1843154&r1=1843153&r2=1843154&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
Mon Oct 8 14:38:48 2018
@@ -32,7 +32,6 @@ import java.util.Properties;
import org.apache.catalina.tribes.ChannelListener;
import org.apache.catalina.tribes.Heartbeat;
import org.apache.catalina.tribes.Member;
-import org.apache.catalina.tribes.membership.Constants;
import org.apache.catalina.tribes.membership.Membership;
import org.apache.catalina.tribes.membership.MembershipProviderBase;
import org.apache.catalina.tribes.util.StringManager;
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java?rev=1843154&r1=1843153&r2=1843154&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
Mon Oct 8 14:38:48 2018
@@ -41,7 +41,7 @@ public class CloudMembershipService exte
public static final String MEMBERSHIP_PROVIDER_CLASS_NAME =
"membershipProviderClassName";
private static final String KUBE = "kubernetes";
-private static final String KUBE_PROVIDER_CLASS =
"org.apache.catalina.cloud.membership.KubernetesMembershipProvider";
+private static final String KUBE_PROVIDER_CLASS =
"org.apache.catalina.tribes.membership.cloud.KubernetesMembershipProvider";
private MembershipProvider membershipProvider;
private MemberImpl localMember;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
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/3630 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] 1843148 Blamelist: remm BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in 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/3631 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] 1843150 Blamelist: remm Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62791] SecureNioChannel fails with "IllegalArgumentException: You can only read using the application read buffer provided by the handler."
https://bz.apache.org/bugzilla/show_bug.cgi?id=62791 --- Comment #7 from Mark Thomas --- Looks like I missed something when looking at the OpenJDK code. >From the Oracle JSSE docs: Note: The SSL/TLS protocols specify that implementations are to produce packets containing at most 16 kilobytes (KB) of plain text. However, some implementations violate the specification and generate large records up to 32 KB. If the SSLEngine.unwrap() code detects large inbound packets, then the buffer sizes returned by SSLSession will be updated dynamically. Applications should always check the BUFFER_OVERFLOW and BUFFER_UNDERFLOW statuses and enlarge the corresponding buffers if necessary. SunJSSE will always send standard compliant 16 KB records and allow incoming 32 KB records. For a workaround, see the System property jsse.SSLEngine.acceptLargeFragments in Customizing JSSE. If we removed the resizing then any spec non-complaint clients are going to fail until Tomcat is restarted with the above system property set. On balance, I think it is best to leave things as they are. -- 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 62791] SecureNioChannel fails with "IllegalArgumentException: You can only read using the application read buffer provided by the handler."
https://bz.apache.org/bugzilla/show_bug.cgi?id=62791 --- Comment #8 from Remy Maucherat --- +1 to leave it as is. -- 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: r1843172 - in /tomcat/native/trunk: build.properties.default native/include/tcn_version.h native/os/win32/libtcnative.rc
Author: markt
Date: Mon Oct 8 16:31:29 2018
New Revision: 1843172
URL: http://svn.apache.org/viewvc?rev=1843172&view=rev
Log:
Increment version for next development cycle
Modified:
tomcat/native/trunk/build.properties.default
tomcat/native/trunk/native/include/tcn_version.h
tomcat/native/trunk/native/os/win32/libtcnative.rc
Modified: tomcat/native/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/build.properties.default?rev=1843172&r1=1843171&r2=1843172&view=diff
==
--- tomcat/native/trunk/build.properties.default (original)
+++ tomcat/native/trunk/build.properties.default Mon Oct 8 16:31:29 2018
@@ -18,7 +18,7 @@
# - Version Control Flags -
version.major=1
version.minor=2
-version.build=17
+version.build=18
version.patch=0
version.suffix=-dev
Modified: tomcat/native/trunk/native/include/tcn_version.h
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/tcn_version.h?rev=1843172&r1=1843171&r2=1843172&view=diff
==
--- tomcat/native/trunk/native/include/tcn_version.h (original)
+++ tomcat/native/trunk/native/include/tcn_version.h Mon Oct 8 16:31:29 2018
@@ -63,7 +63,7 @@ extern "C" {
#define TCN_MINOR_VERSION 2
/** patch level */
-#define TCN_PATCH_VERSION 17
+#define TCN_PATCH_VERSION 18
/**
* This symbol is defined for internal, "development" copies of TCN. This
Modified: tomcat/native/trunk/native/os/win32/libtcnative.rc
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/os/win32/libtcnative.rc?rev=1843172&r1=1843171&r2=1843172&view=diff
==
--- tomcat/native/trunk/native/os/win32/libtcnative.rc (original)
+++ tomcat/native/trunk/native/os/win32/libtcnative.rc Mon Oct 8 16:31:29 2018
@@ -20,7 +20,7 @@ LANGUAGE 0x9,0x1
"See the License for the specific language governing " \
"permissions and limitations under the License."
-#define TCN_VERSION "1.2.17"
+#define TCN_VERSION "1.2.18"
1000 ICON "apache.ico"
1001 DIALOGEX 0, 0, 252, 51
@@ -36,8 +36,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 1,2,17,0
- PRODUCTVERSION 1,2,17,0
+ FILEVERSION 1,2,18,0
+ PRODUCTVERSION 1,2,18,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1842849 - in /tomcat/trunk: java/org/apache/tomcat/jni/Library.java test/org/apache/tomcat/util/net/TesterSupport.java test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
On 10/8/2018 2:52 AM, Mark Thomas wrote:
On 05/10/18 19:46, Christopher Schultz wrote:
Mark,
On 10/5/18 06:22, Mark Thomas wrote:
On 05/10/18 10:42, Rémy Maucherat wrote:
On Fri, Oct 5, 2018 at 11:40 AM Mark Thomas
wrote:
On 04/10/18 22:07, isa...@apache.org wrote:
Author: isapir Date: Thu Oct 4 21:07:54 2018 New Revision:
1842849
URL: http://svn.apache.org/viewvc?rev=1842849&view=rev Log:
System.load() expects absolute path.
Remember to consider whether or not any changes you make to
trunk should be back-ported to 8.5.x and 7.0.x. Generally,
changes are back-ported unless they require changing a public
API (as defined in RELEASE-NOTES) or are considering likely to
cause a regression.
The Tomcat style is to always use { and } even for one line for
clarity.
Due to the age of the code base, there are a mix of styles.
Generally, we try and move code towards the currently accepted
style as we change it.
+1 a lack of { } is too big a possible bug source to ignore.
I just tried enabling the CheckStyle test for this. There were
just under three thousand errors.
I'm wondering if it is worth going through the code base fixing
these.
I'm nearly -1 on this, mostly because it will make back-porting stuff
a total PITA.
Fair enough. I don't need much convincing not to do it as I have plenty
of other stuff on my TODO list.
Definitely opportunistically "upgrade" code we find here and there,
but I don't think it's worth taking a day or two to add missing
explicit blocks everywhere.
ACK.
On a related topic, I did notice several instance of the
following:
if (a == b) ... if (a == c) ... if (a == d) ...
that could be more efficiently written as:
if (a == b) { ... } else if (a == c) { ... } else if (a == d) {
... }
That would be nice. Sounds like a BZ issue that could have a
"beginner" keyword attached.
Good idea. Feel free to add that if I don't get there first.
I'd be happy to work on that.
Igal
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump-vm3]: Project tomcat-tc8.5.x-test-nio2 (in module tomcat-8.5.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.5.x-test-nio2 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.5.x-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.5.x/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.5.x/output/test-tmp-NIO2/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.5.x/output/test-tmp-NIO2/logs] The following work was performed: http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-test-nio2/gump_work/build_tomcat-8.5.x_tomcat-tc8.5.x-test-nio2.html Work Name: build_tomcat-8.5.x_tomcat-tc8.5.x-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 18 mins 30 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 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 -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.5.x/true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dexecute.test.nio2=true -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-8.5.x/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.1.1/dest-20181008/bin/openssl -Dexe cute.test.bio=false -Dexecute.test.apr=false -Dtest.excludePerformance=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.7-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.5.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.5.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.5.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/bu ild/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-util.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-uti
[GUMP@vmgump-vm3]: Project tomcat-trunk (in module tomcat-trunk) 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-trunk has an issue affecting its community integration.
This issue affects 4 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk : Tomcat 9.x, a web server implementing the Java Servlet
4.0,
...
- tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java
Servlet 4.0,
...
- tomcat-trunk-test-nio : Tomcat 9.x, a web server implementing the Java
Servlet 4.0,
...
- tomcat-trunk-test-nio2 : Tomcat 9.x, a web server implementing the Java
Servlet 4.0,
...
Full details are available at:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk/index.html
That said, some information snippets are provided here.
The following annotations (debug/informational/warning/error messages) were
provided:
-DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar.
-DEBUG- Dependency on junit exists, no need to add for property junit.jar.
-INFO- Made directory [/srv/gump/public/workspace/tomcat-trunk/tomcat-deps]
-INFO- Failed with reason build failed
-DEBUG- Extracted fallback artifacts from Gump Repository
The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk/gump_work/build_tomcat-trunk_tomcat-trunk.html
Work Name: build_tomcat-trunk_tomcat-trunk (Type: Build)
Work ended in a state of : Failed
Elapsed: 16 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true
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
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
-Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
-Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH:
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/classes:/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/junit/target/junit-4.13-SNAPSHOT.jar:/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar:/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar:/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar
-
[javac] import com.github.openjson.JSONTokener;
[javac] ^
[javac]
/srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java:135:
error: cannot find symbol
[javac] JSONObject json = new JSONObject(new JSONTokener(new
InputStreamReader(stream, "UTF-8")));
[javac] ^
[javac] symbol: class JSONObject
[javac] location: class KubernetesMembershipProvider
[javac]
/srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java:135:
error: cannot find symbol
[javac] JSONObject json = new JSONObject(new JSONTokener(new
InputStreamReader(stream, "UTF-8")));
[javac] ^
[javac] symbol: class JSONObject
[javac] location: class KubernetesMembershipProvider
[javac]
/srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java:135:
error: cannot find symbol
[javac] JSONObject json = new JSONObject(new JSONTokener(new
InputStreamReader(stream, "UTF-8")));
[javac] ^
[javac] symbol: class JSONTokener
[javac] location: class KubernetesMembershipProvider
[javac]
/srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java:137:
error: cannot find symbol
[javac] JSONArray items = json.getJSONArray("items");
[javac]
[Bug 62808] New: "function-signature" text coutaining line breaks causes JasperException
https://bz.apache.org/bugzilla/show_bug.cgi?id=62808 Bug ID: 62808 Summary: "function-signature" text coutaining line breaks causes JasperException Product: Tomcat 7 Version: 7.0.91 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Jasper Assignee: dev@tomcat.apache.org Reporter: katsut...@worksap.co.jp Target Milestone: --- When a function was defined in tld file with function-signature containing line breaks causes JasperException in Tomcat v7.0.91. For example ``` getSomething com.example.Functions com.example getSomething(com.example.longpackagename.Foo, com.example.longpackagename.Bar, com.example.longpackagename.Baz) ``` This function definition works well in Tomcat v7.0.85 But not work in Tomcat v7.0.91. In Tomcat v7.0.91, this definition causes JasperException like bellow. ``` Oct 09, 2018 11:22:04 AM org.apache.catalina.core.ApplicationDispatcher invoke SEVERE: Servlet.service() for servlet jsp threw exception org.apache.jasper.JasperException: Invalid syntax for function signature in TLD. Tag Library: xxx, Function: getSomething at org.apache.jasper.compiler.DefaultErrorHandler.jspError(DefaultErrorHandler.java:56) at org.apache.jasper.compiler.ErrorDispatcher.dispatch(ErrorDispatcher.java:445) at org.apache.jasper.compiler.ErrorDispatcher.jspError(ErrorDispatcher.java:165) at org.apache.jasper.compiler.Validator$ValidateVisitor.getMethod(Validator.java:1648) at org.apache.jasper.compiler.Validator$ValidateVisitor.processSignature(Validator.java:1635) at org.apache.jasper.compiler.Validator$ValidateVisitor.access$400(Validator.java:420) at org.apache.jasper.compiler.Validator$ValidateVisitor$1FVVisitor.visit(Validator.java:1611) at org.apache.jasper.compiler.ELNode$Function.accept(ELNode.java:139) ... ``` However, according to the specification of JSR 245, "function-signature" can contain line breaks (LF or CRLF). So I think that this behavior violates the specification. http://download.oracle.com/otn-pub/jcp/jsp-2.1-fr-spec-oth-JSpec/jsp-2_1-fr-spec.pdf The detail of definition is below. The spec of "function-signature" element was defined in p. 3-32 as follows. ``` function-signature element is as follows: FunctionSignature ::= ReturnType S MethodName S? ’(’ S? Parameters? S? ’)’ ReturnType::= Type MethodName::= Identifier Parameters::= Parameter | ( Parameter S? ’,’ S? Parameters ) Parameter ::= Type ``` The "S" was defined as follows. p. 1-27 ``` S::= XML:: ``` p. 1-16 ``` The prefix XML:: is used to refer to an EBNF definition in the XML 1.0 speci- fication. Refer to http://www.w3.org/TR/REC-xml ``` https://www.w3.org/TR/REC-xml/#NT-S ``` S (white space) consists of one or more space (#x20) characters, carriage returns, line feeds, or tabs. ``` We think that this change is the cause of this problem and I'm afraid that the same change was also done in Tomcat v8.0.x and v9.0.x ref. http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java?r1=1840104&r2=1840103&pathrev=1840104 -- 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: SVN Workflow and Backporting
On Mon, Oct 8, 2018 at 3:04 AM Mark Thomas wrote: > On 06/10/18 23:08, Igal Sapir wrote: > > I am rather new to SVN, and actually use it mostly via GIT, i.e. `git svn > > rebase` and `git svn dcommit`. > > > > What is the best way to backport specific patches from trunk to 8.5, 7.0, > > etc.? Patch utility? SVN Merge? GIT cherry-pick (though the git > mirrors > > have a separate repos which adds some complexity I think) > > > > I'd appreciate any tips that will point me in the right direction, or if > > anyone can share their workflow. > > I use svn for backports. I use the following scripts. The first to merge > from trunk to 8.5.x, the second to merge from 8.5.x to 7.0.x. I `cd` > into the root of the repo for the version I want to merge to and then > call the script with the revision of the commit I want to back-port. > > HTH, > > Mark > > mark@study04:~/bin$ cat tc-merge.sh > #!/bin/sh > svn up > svn merge -c $1 https://svn.apache.org/repos/asf/tomcat/trunk > > mark@study04:~/bin$ cat tc85-merge.sh > #!/bin/sh > svn up > svn merge -c $1 https://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk > > It helps, thanks, but I don't know if the target file has been changed or if I did something wrong, I'm getting a conflict (in git I can see the differences and choose resolution, but here I don't know which one to pick). Or is it because I waited too long and didn't do this immediately after committing the original patch to trunk? Here's the output from the script: tc8.5.x]$ ~/bin/svn-merge-tc-trunk-to-85.sh 1842849 Updating '.': At revision 1843219. --- Merging r1842849 into '.': C test C java --- Recording mergeinfo for merge of r1842849 into '.': U . Summary of conflicts: Tree conflicts: 2 Searching tree conflict details for 'java' in repository: Checking r1842849... done Tree conflict on 'java': Changes destined for a directory arrived during merge of '^/tomcat/trunk/java:1842849'. No such file or directory was found in the merge target working copy. The item may have been deleted or moved away in the repository's history. Subversion is not smart enough to resolve this tree conflict automatically! Apparently neither am I :s
[Bug 62808] "function-signature" text containing line breaks causes JasperException
https://bz.apache.org/bugzilla/show_bug.cgi?id=62808 katsut...@worksap.co.jp changed: What|Removed |Added Summary|"function-signature" text |"function-signature" text |coutaining line breaks |containing line breaks |causes JasperException |causes JasperException OS||All -- 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: svn commit: r1842849 - in /tomcat/trunk: java/org/apache/tomcat/jni/Library.java test/org/apache/tomcat/util/net/TesterSupport.java test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
Mark,
On Mon, Oct 8, 2018 at 2:52 AM Mark Thomas wrote:
> On 05/10/18 19:46, Christopher Schultz wrote:
>
> >>> +1 a lack of { } is too big a possible bug source to ignore.
> >
> >> I just tried enabling the CheckStyle test for this. There were
> >> just under three thousand errors.
> >
> >> I'm wondering if it is worth going through the code base fixing
> >> these.
> >
> > I'm nearly -1 on this, mostly because it will make back-porting stuff
> > a total PITA.
>
> Fair enough. I don't need much convincing not to do it as I have plenty
> of other stuff on my TODO list.
>
> > Definitely opportunistically "upgrade" code we find here and there,
> > but I don't think it's worth taking a day or two to add missing
> > explicit blocks everywhere.
>
> ACK.
>
> >> On a related topic, I did notice several instance of the
> >> following:
> >
> >> if (a == b) ... if (a == c) ... if (a == d) ...
> >
> >> that could be more efficiently written as:
> >
> >> if (a == b) { ... } else if (a == c) { ... } else if (a == d) {
> >> ... }
> >
> > That would be nice. Sounds like a BZ issue that could have a
> > "beginner" keyword attached.
>
> Good idea. Feel free to add that if I don't get there first.
>
>
Did you notice the consecutive if statements by chance, or does CheckStyle
report those? I just imported the CheckStyle profile into IntelliJ IDEA
and I see more than 82,000 warnings, many of which complaining of missing
Javadoc comments and lines longer than 80 characters.
Thanks,
Igal
Re: SVN Workflow and Backporting
Am 09.10.2018 um 06:55 schrieb Igal Sapir: On Mon, Oct 8, 2018 at 3:04 AM Mark Thomas wrote: On 06/10/18 23:08, Igal Sapir wrote: I am rather new to SVN, and actually use it mostly via GIT, i.e. `git svn rebase` and `git svn dcommit`. What is the best way to backport specific patches from trunk to 8.5, 7.0, etc.? Patch utility? SVN Merge? GIT cherry-pick (though the git mirrors have a separate repos which adds some complexity I think) I'd appreciate any tips that will point me in the right direction, or if anyone can share their workflow. I use svn for backports. I use the following scripts. The first to merge from trunk to 8.5.x, the second to merge from 8.5.x to 7.0.x. I `cd` into the root of the repo for the version I want to merge to and then call the script with the revision of the commit I want to back-port. HTH, Mark mark@study04:~/bin$ cat tc-merge.sh #!/bin/sh svn up svn merge -c $1 https://svn.apache.org/repos/asf/tomcat/trunk mark@study04:~/bin$ cat tc85-merge.sh #!/bin/sh svn up svn merge -c $1 https://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk It helps, thanks, but I don't know if the target file has been changed or if I did something wrong, I'm getting a conflict (in git I can see the differences and choose resolution, but here I don't know which one to pick). Or is it because I waited too long and didn't do this immediately after committing the original patch to trunk? Here's the output from the script: tc8.5.x]$ ~/bin/svn-merge-tc-trunk-to-85.sh 1842849 Updating '.': At revision 1843219. --- Merging r1842849 into '.': C test C java --- Recording mergeinfo for merge of r1842849 into '.': U . Summary of conflicts: Tree conflicts: 2 Searching tree conflict details for 'java' in repository: Checking r1842849... done Tree conflict on 'java': Changes destined for a directory arrived during merge of '^/tomcat/trunk/java:1842849'. No such file or directory was found in the merge target working copy. The item may have been deleted or moved away in the repository's history. Subversion is not smart enough to resolve this tree conflict automatically! Apparently neither am I :s Not sure, but from the prompt it looks like your shell working directory is a 8.5 checkout and your are using the script that contains the command to merge from 8.5 to some older branch. When standiung in 8.5 you want to merge from trunk (9.0) into 8.5. That would be done by the tc-merge.sh script. You might now need to first reset your checkout using something like "svn -R revert ." before try running that script. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
