svn commit: r1738706 - in /tomcat/trunk: java/org/apache/catalina/tribes/membership/MemberImpl.java webapps/docs/changelog.xml
Author: kfujino Date: Tue Apr 12 07:08:48 2016 New Revision: 1738706 URL: http://svn.apache.org/viewvc?rev=1738706&view=rev Log: Fix potential NPE that depends on the setting order of attributes of static member when using the static cluster. Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=1738706&r1=1738705&r2=1738706&view=diff == --- tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Tue Apr 12 07:08:48 2016 @@ -48,7 +48,7 @@ public class MemberImpl implements Membe /** * The listen host for this member */ -protected volatile byte[] host; +protected volatile byte[] host = new byte[0]; protected transient volatile String hostname; /** * The tcp listen port for this member Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1738706&r1=1738705&r2=1738706&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Apr 12 07:08:48 2016 @@ -210,6 +210,10 @@ Add the flag indicating that member is a localMember. (kfujino) + +Fix potential NPE that depends on the setting order of attributes of +static member when using the static cluster. (kfujino) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1738708 - in /tomcat/tc8.5.x/trunk: java/org/apache/catalina/tribes/membership/MemberImpl.java webapps/docs/changelog.xml
Author: kfujino Date: Tue Apr 12 07:10:21 2016 New Revision: 1738708 URL: http://svn.apache.org/viewvc?rev=1738708&view=rev Log: Fix potential NPE that depends on the setting order of attributes of static member when using the static cluster. Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=1738708&r1=1738707&r2=1738708&view=diff == --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Tue Apr 12 07:10:21 2016 @@ -48,7 +48,7 @@ public class MemberImpl implements Membe /** * The listen host for this member */ -protected volatile byte[] host; +protected volatile byte[] host = new byte[0]; protected transient volatile String hostname; /** * The tcp listen port for this member Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1738708&r1=1738707&r2=1738708&view=diff == --- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue Apr 12 07:10:21 2016 @@ -208,6 +208,10 @@ Add the flag indicating that member is a localMember. (kfujino) + +Fix potential NPE that depends on the setting order of attributes of +static member when using the static cluster. (kfujino) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1738709 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/tribes/membership/MemberImpl.java webapps/docs/changelog.xml
Author: kfujino Date: Tue Apr 12 07:11:34 2016 New Revision: 1738709 URL: http://svn.apache.org/viewvc?rev=1738709&view=rev Log: Fix potential NPE that depends on the setting order of attributes of static member when using the static cluster. Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=1738709&r1=1738708&r2=1738709&view=diff == --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Tue Apr 12 07:11:34 2016 @@ -48,7 +48,7 @@ public class MemberImpl implements Membe /** * The listen host for this member */ -protected volatile byte[] host; +protected volatile byte[] host = new byte[0]; protected transient volatile String hostname; /** * The tcp listen port for this member Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1738709&r1=1738708&r2=1738709&view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Apr 12 07:11:34 2016 @@ -163,6 +163,10 @@ Add the flag indicating that member is a localMember. (kfujino) + +Fix potential NPE that depends on the setting order of attributes of +static member when using the static cluster. (kfujino) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1738711 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/tribes/membership/MemberImpl.java webapps/docs/changelog.xml
Author: kfujino Date: Tue Apr 12 07:12:43 2016 New Revision: 1738711 URL: http://svn.apache.org/viewvc?rev=1738711&view=rev Log: Fix potential NPE that depends on the setting order of attributes of static member when using the static cluster. Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=1738711&r1=1738710&r2=1738711&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Tue Apr 12 07:12:43 2016 @@ -63,7 +63,7 @@ public class MemberImpl implements Membe /** * The listen host for this member */ -protected byte[] host; +protected byte[] host = new byte[0]; protected transient String hostname; /** * The tcp listen port for this member Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1738711&r1=1738710&r2=1738711&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Apr 12 07:12:43 2016 @@ -66,6 +66,14 @@ + + + +Fix potential NPE that depends on the setting order of attributes of +static member when using the static cluster. (kfujino) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r13142 - /release/tomcat/tomcat-9/KEYS
Author: markt Date: Tue Apr 12 07:37:58 2016 New Revision: 13142 Log: Add KETS file to 9.0.x dist area Added: release/tomcat/tomcat-9/KEYS - copied unchanged from r12756, release/tomcat/tomcat-8/KEYS - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1738716 - in /tomcat/trunk: java/org/apache/catalina/tribes/ChannelInterceptor.java java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java java/org/apache/catalina/tribes/group
Author: kfujino
Date: Tue Apr 12 07:38:41 2016
New Revision: 1738716
URL: http://svn.apache.org/viewvc?rev=1738716&view=rev
Log:
Add get/set method for the channel that is related to ChannelInterceptor.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java?rev=1738716&r1=1738715&r2=1738716&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java Tue
Apr 12 07:38:41 2016
@@ -168,6 +168,18 @@ public interface ChannelInterceptor exte
public void fireInterceptorEvent(InterceptorEvent event);
+/**
+ * Return the channel that is related to this interceptor
+ * @return Channel
+ */
+public Channel getChannel();
+
+/**
+ * Set the channel that is related to this interceptor
+ * @param channel
+ */
+public void setChannel(Channel channel);
+
interface InterceptorEvent {
int getEventType();
String getEventTypeDesc();
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java?rev=1738716&r1=1738715&r2=1738716&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
Tue Apr 12 07:38:41 2016
@@ -16,6 +16,7 @@
*/
package org.apache.catalina.tribes.group;
+import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ChannelException;
import org.apache.catalina.tribes.ChannelInterceptor;
import org.apache.catalina.tribes.ChannelMessage;
@@ -28,6 +29,7 @@ public abstract class ChannelInterceptor
private ChannelInterceptor next;
private ChannelInterceptor previous;
+private Channel channel;
//default value, always process
protected int optionFlag = 0;
@@ -176,5 +178,22 @@ public abstract class ChannelInterceptor
//empty operation
}
+/**
+ * Return the channel that is related to this interceptor
+ * @return Channel
+ */
+@Override
+public Channel getChannel() {
+return channel;
+}
+
+/**
+ * Set the channel that is related to this interceptor
+ * @param channel
+ */
+@Override
+public void setChannel(Channel channel) {
+this.channel = channel;
+}
}
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1738716&r1=1738715&r2=1738716&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Tue
Apr 12 07:38:41 2016
@@ -129,11 +129,13 @@ public class GroupChannel extends Channe
*/
@Override
public void addInterceptor(ChannelInterceptor interceptor) {
+interceptor.setChannel(this);
if ( interceptors == null ) {
interceptors = interceptor;
interceptors.setNext(coordinator);
interceptors.setPrevious(null);
coordinator.setPrevious(interceptors);
+coordinator.setChannel(this);
} else {
ChannelInterceptor last = interceptors;
while ( last.getNext() != coordinator ) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1738716&r1=1738715&r2=1738716&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Apr 12 07:38:41 2016
@@ -214,6 +214,10 @@
Fix potential NPE that depends on the setting order of attributes of
static member when using the static cluster. (kfujino)
+
+Add get/set method for the channel that is related to
+ChannelInterceptor. (kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r13143 - /release/tomcat/tomcat-9/v9.0.0.M3/
Author: markt Date: Tue Apr 12 07:39:30 2016 New Revision: 13143 Log: Drop old release from mirrors Removed: release/tomcat/tomcat-9/v9.0.0.M3/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r13144 - /release/tomcat/tomcat-6/v6.0.44/
Author: markt Date: Tue Apr 12 07:39:54 2016 New Revision: 13144 Log: Drop old release from mirrors Removed: release/tomcat/tomcat-6/v6.0.44/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r13146 - /release/tomcat/tomcat-connectors/native/1.2.4/
Author: markt Date: Tue Apr 12 07:41:23 2016 New Revision: 13146 Log: Drop old release from mirrors Removed: release/tomcat/tomcat-connectors/native/1.2.4/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r13145 - /release/tomcat/tomcat-connectors/jk/
Author: markt Date: Tue Apr 12 07:41:11 2016 New Revision: 13145 Log: Drop old release from mirrors Removed: release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.tar.gz release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.tar.gz.asc release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.tar.gz.md5 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.tar.gz.sha1 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.zip release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.zip.asc release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.zip.md5 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.zip.sha1 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1738717 - in /tomcat/tc8.5.x/trunk: java/org/apache/catalina/tribes/ChannelInterceptor.java java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java java/org/apache/catalina/trib
Author: kfujino
Date: Tue Apr 12 07:42:09 2016
New Revision: 1738717
URL: http://svn.apache.org/viewvc?rev=1738717&view=rev
Log:
Add get/set method for the channel that is related to ChannelInterceptor.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java?rev=1738717&r1=1738716&r2=1738717&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
Tue Apr 12 07:42:09 2016
@@ -168,6 +168,18 @@ public interface ChannelInterceptor exte
public void fireInterceptorEvent(InterceptorEvent event);
+/**
+ * Return the channel that is related to this interceptor
+ * @return Channel
+ */
+public Channel getChannel();
+
+/**
+ * Set the channel that is related to this interceptor
+ * @param channel
+ */
+public void setChannel(Channel channel);
+
interface InterceptorEvent {
int getEventType();
String getEventTypeDesc();
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java?rev=1738717&r1=1738716&r2=1738717&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
Tue Apr 12 07:42:09 2016
@@ -16,6 +16,7 @@
*/
package org.apache.catalina.tribes.group;
+import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ChannelException;
import org.apache.catalina.tribes.ChannelInterceptor;
import org.apache.catalina.tribes.ChannelMessage;
@@ -28,6 +29,7 @@ public abstract class ChannelInterceptor
private ChannelInterceptor next;
private ChannelInterceptor previous;
+private Channel channel;
//default value, always process
protected int optionFlag = 0;
@@ -176,5 +178,22 @@ public abstract class ChannelInterceptor
//empty operation
}
+/**
+ * Return the channel that is related to this interceptor
+ * @return Channel
+ */
+@Override
+public Channel getChannel() {
+return channel;
+}
+
+/**
+ * Set the channel that is related to this interceptor
+ * @param channel
+ */
+@Override
+public void setChannel(Channel channel) {
+this.channel = channel;
+}
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1738717&r1=1738716&r2=1738717&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
Tue Apr 12 07:42:09 2016
@@ -129,11 +129,13 @@ public class GroupChannel extends Channe
*/
@Override
public void addInterceptor(ChannelInterceptor interceptor) {
+interceptor.setChannel(this);
if ( interceptors == null ) {
interceptors = interceptor;
interceptors.setNext(coordinator);
interceptors.setPrevious(null);
coordinator.setPrevious(interceptors);
+coordinator.setChannel(this);
} else {
ChannelInterceptor last = interceptors;
while ( last.getNext() != coordinator ) {
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1738717&r1=1738716&r2=1738717&view=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue Apr 12 07:42:09 2016
@@ -212,6 +212,10 @@
Fix potential NPE that depends on the setting order of attributes of
static member when using the static cluster. (kfujino)
+
+Add get/set method for the channel that is related to
+ChannelInterceptor. (kfujino)
+
--
svn commit: r1738718 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java java/org/apache/catalina/tribes/group/GroupChannel.java webapps/docs/changelog.xml
Author: kfujino
Date: Tue Apr 12 07:44:40 2016
New Revision: 1738718
URL: http://svn.apache.org/viewvc?rev=1738718&view=rev
Log:
Add get/set method for the channel that is related to ChannelInterceptorBase.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java?rev=1738718&r1=1738717&r2=1738718&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
Tue Apr 12 07:44:40 2016
@@ -16,6 +16,7 @@
*/
package org.apache.catalina.tribes.group;
+import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ChannelException;
import org.apache.catalina.tribes.ChannelInterceptor;
import org.apache.catalina.tribes.ChannelMessage;
@@ -28,6 +29,7 @@ public abstract class ChannelInterceptor
private ChannelInterceptor next;
private ChannelInterceptor previous;
+private Channel channel;
//default value, always process
protected int optionFlag = 0;
@@ -176,5 +178,20 @@ public abstract class ChannelInterceptor
//empty operation
}
+/**
+ * Return the channel that is related to this interceptor
+ * @return Channel
+ */
+public Channel getChannel() {
+return channel;
+}
+
+/**
+ * Set the channel that is related to this interceptor
+ * @param channel
+ */
+public void setChannel(Channel channel) {
+this.channel = channel;
+}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1738718&r1=1738717&r2=1738718&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
Tue Apr 12 07:44:40 2016
@@ -130,11 +130,14 @@ public class GroupChannel extends Channe
*/
@Override
public void addInterceptor(ChannelInterceptor interceptor) {
+if (interceptor instanceof ChannelInterceptorBase)
+((ChannelInterceptorBase)interceptor).setChannel(this);
if ( interceptors == null ) {
interceptors = interceptor;
interceptors.setNext(coordinator);
interceptors.setPrevious(null);
coordinator.setPrevious(interceptors);
+coordinator.setChannel(this);
} else {
ChannelInterceptor last = interceptors;
while ( last.getNext() != coordinator ) {
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1738718&r1=1738717&r2=1738718&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Apr 12 07:44:40 2016
@@ -167,6 +167,10 @@
Fix potential NPE that depends on the setting order of attributes of
static member when using the static cluster. (kfujino)
+
+Add get/set method for the channel that is related to
+ChannelInterceptorBase. (kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1738719 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java java/org/apache/catalina/tribes/group/GroupChannel.java webapps/docs/changelog.xml
Author: kfujino
Date: Tue Apr 12 07:46:47 2016
New Revision: 1738719
URL: http://svn.apache.org/viewvc?rev=1738719&view=rev
Log:
Add get/set method for the channel that is related to ChannelInterceptorBase.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java?rev=1738719&r1=1738718&r2=1738719&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
Tue Apr 12 07:46:47 2016
@@ -16,6 +16,7 @@
*/
package org.apache.catalina.tribes.group;
+import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ChannelException;
import org.apache.catalina.tribes.ChannelInterceptor;
import org.apache.catalina.tribes.ChannelMessage;
@@ -29,6 +30,7 @@ public abstract class ChannelInterceptor
private ChannelInterceptor next;
private ChannelInterceptor previous;
+private Channel channel;
//default value, always process
protected int optionFlag = 0;
@@ -181,5 +183,20 @@ public abstract class ChannelInterceptor
//empty operation
}
+/**
+ * Return the channel that is related to this interceptor
+ * @return Channel
+ */
+public Channel getChannel() {
+return channel;
+}
+
+/**
+ * Set the channel that is related to this interceptor
+ * @param channel
+ */
+public void setChannel(Channel channel) {
+this.channel = channel;
+}
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1738719&r1=1738718&r2=1738719&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
Tue Apr 12 07:46:47 2016
@@ -128,11 +128,14 @@ public class GroupChannel extends Channe
*/
@Override
public void addInterceptor(ChannelInterceptor interceptor) {
+if (interceptor instanceof ChannelInterceptorBase)
+((ChannelInterceptorBase)interceptor).setChannel(this);
if ( interceptors == null ) {
interceptors = interceptor;
interceptors.setNext(coordinator);
interceptors.setPrevious(null);
coordinator.setPrevious(interceptors);
+coordinator.setChannel(this);
} else {
ChannelInterceptor last = interceptors;
while ( last.getNext() != coordinator ) {
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1738719&r1=1738718&r2=1738719&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Apr 12 07:46:47 2016
@@ -72,6 +72,10 @@
Fix potential NPE that depends on the setting order of attributes of
static member when using the static cluster. (kfujino)
+
+Add get/set method for the channel that is related to
+ChannelInterceptorBase. (kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1738721 - in /tomcat/trunk: java/org/apache/catalina/tribes/group/ChannelCoordinator.java webapps/docs/changelog.xml
Author: kfujino
Date: Tue Apr 12 07:50:28 2016
New Revision: 1738721
URL: http://svn.apache.org/viewvc?rev=1738721&view=rev
Log:
As with the multicast cluster environment, in the static cluster environment,
the local member inherits properties from the cluster receiver.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1738721&r1=1738720&r2=1738721&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
Tue Apr 12 07:50:28 2016
@@ -26,6 +26,7 @@ import org.apache.catalina.tribes.Member
import org.apache.catalina.tribes.MessageListener;
import org.apache.catalina.tribes.UniqueId;
import org.apache.catalina.tribes.membership.McastService;
+import org.apache.catalina.tribes.membership.StaticMember;
import org.apache.catalina.tribes.transport.ReplicationTransmitter;
import org.apache.catalina.tribes.transport.SenderState;
import org.apache.catalina.tribes.transport.nio.NioReceiver;
@@ -152,10 +153,21 @@ public class ChannelCoordinator extends
clusterReceiver.setMessageListener(this);
clusterReceiver.start();
//synchronize, big time FIXME
-
membershipService.setLocalMemberProperties(getClusterReceiver().getHost(),
-
getClusterReceiver().getPort(),
-
getClusterReceiver().getSecurePort(),
-
getClusterReceiver().getUdpPort());
+Member localMember = getChannel().getLocalMember(false);
+if (localMember instanceof StaticMember) {
+// static member
+StaticMember staticMember = (StaticMember)localMember;
+staticMember.setHost(getClusterReceiver().getHost());
+staticMember.setPort(getClusterReceiver().getPort());
+
staticMember.setSecurePort(getClusterReceiver().getSecurePort());
+} else {
+// multicast member
+
membershipService.setLocalMemberProperties(getClusterReceiver().getHost(),
+getClusterReceiver().getPort(),
+getClusterReceiver().getSecurePort(),
+getClusterReceiver().getUdpPort());
+
+}
valid = true;
}
if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1738721&r1=1738720&r2=1738721&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Apr 12 07:50:28 2016
@@ -218,6 +218,11 @@
Add get/set method for the channel that is related to
ChannelInterceptor. (kfujino)
+
+As with the multicast cluster environment, in the static cluster
+environment, the local member inherits properties from the cluster
+receiver. (kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1738722 - in /tomcat/tc8.5.x/trunk: java/org/apache/catalina/tribes/group/ChannelCoordinator.java webapps/docs/changelog.xml
Author: kfujino
Date: Tue Apr 12 07:52:27 2016
New Revision: 1738722
URL: http://svn.apache.org/viewvc?rev=1738722&view=rev
Log:
As with the multicast cluster environment, in the static cluster environment,
the local member inherits properties from the cluster receiver.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1738722&r1=1738721&r2=1738722&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
Tue Apr 12 07:52:27 2016
@@ -26,6 +26,7 @@ import org.apache.catalina.tribes.Member
import org.apache.catalina.tribes.MessageListener;
import org.apache.catalina.tribes.UniqueId;
import org.apache.catalina.tribes.membership.McastService;
+import org.apache.catalina.tribes.membership.StaticMember;
import org.apache.catalina.tribes.transport.ReplicationTransmitter;
import org.apache.catalina.tribes.transport.SenderState;
import org.apache.catalina.tribes.transport.nio.NioReceiver;
@@ -152,10 +153,21 @@ public class ChannelCoordinator extends
clusterReceiver.setMessageListener(this);
clusterReceiver.start();
//synchronize, big time FIXME
-
membershipService.setLocalMemberProperties(getClusterReceiver().getHost(),
-
getClusterReceiver().getPort(),
-
getClusterReceiver().getSecurePort(),
-
getClusterReceiver().getUdpPort());
+Member localMember = getChannel().getLocalMember(false);
+if (localMember instanceof StaticMember) {
+// static member
+StaticMember staticMember = (StaticMember)localMember;
+staticMember.setHost(getClusterReceiver().getHost());
+staticMember.setPort(getClusterReceiver().getPort());
+
staticMember.setSecurePort(getClusterReceiver().getSecurePort());
+} else {
+// multicast member
+
membershipService.setLocalMemberProperties(getClusterReceiver().getHost(),
+getClusterReceiver().getPort(),
+getClusterReceiver().getSecurePort(),
+getClusterReceiver().getUdpPort());
+
+}
valid = true;
}
if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1738722&r1=1738721&r2=1738722&view=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue Apr 12 07:52:27 2016
@@ -216,6 +216,11 @@
Add get/set method for the channel that is related to
ChannelInterceptor. (kfujino)
+
+As with the multicast cluster environment, in the static cluster
+environment, the local member inherits properties from the cluster
+receiver. (kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1738723 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/tribes/group/ChannelCoordinator.java webapps/docs/changelog.xml
Author: kfujino
Date: Tue Apr 12 07:54:26 2016
New Revision: 1738723
URL: http://svn.apache.org/viewvc?rev=1738723&view=rev
Log:
As with the multicast cluster environment, in the static cluster environment,
the local member inherits properties from the cluster receiver.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1738723&r1=1738722&r2=1738723&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
Tue Apr 12 07:54:26 2016
@@ -26,6 +26,7 @@ import org.apache.catalina.tribes.Member
import org.apache.catalina.tribes.MessageListener;
import org.apache.catalina.tribes.UniqueId;
import org.apache.catalina.tribes.membership.McastService;
+import org.apache.catalina.tribes.membership.StaticMember;
import org.apache.catalina.tribes.transport.ReplicationTransmitter;
import org.apache.catalina.tribes.transport.SenderState;
import org.apache.catalina.tribes.transport.nio.NioReceiver;
@@ -153,10 +154,21 @@ public class ChannelCoordinator extends
clusterReceiver.setMessageListener(this);
clusterReceiver.start();
//synchronize, big time FIXME
-
membershipService.setLocalMemberProperties(getClusterReceiver().getHost(),
-
getClusterReceiver().getPort(),
-
getClusterReceiver().getSecurePort(),
-
getClusterReceiver().getUdpPort());
+Member localMember = getChannel().getLocalMember(false);
+if (localMember instanceof StaticMember) {
+// static member
+StaticMember staticMember = (StaticMember)localMember;
+staticMember.setHost(getClusterReceiver().getHost());
+staticMember.setPort(getClusterReceiver().getPort());
+
staticMember.setSecurePort(getClusterReceiver().getSecurePort());
+} else {
+// multicast member
+
membershipService.setLocalMemberProperties(getClusterReceiver().getHost(),
+getClusterReceiver().getPort(),
+getClusterReceiver().getSecurePort(),
+getClusterReceiver().getUdpPort());
+
+}
valid = true;
}
if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1738723&r1=1738722&r2=1738723&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Apr 12 07:54:26 2016
@@ -171,6 +171,11 @@
Add get/set method for the channel that is related to
ChannelInterceptorBase. (kfujino)
+
+As with the multicast cluster environment, in the static cluster
+environment, the local member inherits properties from the cluster
+receiver. (kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1738724 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/tribes/group/ChannelCoordinator.java webapps/docs/changelog.xml
Author: kfujino
Date: Tue Apr 12 07:56:11 2016
New Revision: 1738724
URL: http://svn.apache.org/viewvc?rev=1738724&view=rev
Log:
As with the multicast cluster environment, in the static cluster environment,
the local member inherits properties from the cluster receiver.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1738724&r1=1738723&r2=1738724&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
Tue Apr 12 07:56:11 2016
@@ -26,6 +26,7 @@ import org.apache.catalina.tribes.Member
import org.apache.catalina.tribes.MessageListener;
import org.apache.catalina.tribes.UniqueId;
import org.apache.catalina.tribes.membership.McastService;
+import org.apache.catalina.tribes.membership.StaticMember;
import org.apache.catalina.tribes.transport.ReplicationTransmitter;
import org.apache.catalina.tribes.transport.SenderState;
import org.apache.catalina.tribes.transport.nio.NioReceiver;
@@ -143,10 +144,21 @@ public class ChannelCoordinator extends
clusterReceiver.setMessageListener(this);
clusterReceiver.start();
//synchronize, big time FIXME
-
membershipService.setLocalMemberProperties(getClusterReceiver().getHost(),
-
getClusterReceiver().getPort(),
-
getClusterReceiver().getSecurePort(),
-
getClusterReceiver().getUdpPort());
+Member localMember = getChannel().getLocalMember(false);
+if (localMember instanceof StaticMember) {
+// static member
+StaticMember staticMember = (StaticMember)localMember;
+staticMember.setHost(getClusterReceiver().getHost());
+staticMember.setPort(getClusterReceiver().getPort());
+
staticMember.setSecurePort(getClusterReceiver().getSecurePort());
+} else {
+// multicast member
+
membershipService.setLocalMemberProperties(getClusterReceiver().getHost(),
+getClusterReceiver().getPort(),
+getClusterReceiver().getSecurePort(),
+getClusterReceiver().getUdpPort());
+
+}
valid = true;
}
if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1738724&r1=1738723&r2=1738724&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Apr 12 07:56:11 2016
@@ -76,6 +76,11 @@
Add get/set method for the channel that is related to
ChannelInterceptorBase. (kfujino)
+
+As with the multicast cluster environment, in the static cluster
+environment, the local member inherits properties from the cluster
+receiver. (kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1738725 - /tomcat/trunk/webapps/docs/config/cluster-interceptor.xml
Author: kfujino Date: Tue Apr 12 08:00:26 2016 New Revision: 1738725 URL: http://svn.apache.org/viewvc?rev=1738725&view=rev Log: Fix LocalMember attributes and sample config in interceptor documnent. Modified: tomcat/trunk/webapps/docs/config/cluster-interceptor.xml Modified: tomcat/trunk/webapps/docs/config/cluster-interceptor.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-interceptor.xml?rev=1738725&r1=1738724&r2=1738725&view=diff == --- tomcat/trunk/webapps/docs/config/cluster-interceptor.xml (original) +++ tomcat/trunk/webapps/docs/config/cluster-interceptor.xml Tue Apr 12 08:00:26 2016 @@ -67,9 +67,6 @@ so they will have the same level of notification mechanism as the members that are automatically discovered.
svn commit: r1738726 - /tomcat/tc8.5.x/trunk/webapps/docs/config/cluster-interceptor.xml
Author: kfujino Date: Tue Apr 12 08:01:20 2016 New Revision: 1738726 URL: http://svn.apache.org/viewvc?rev=1738726&view=rev Log: Fix LocalMember attributes and sample config in interceptor documnent. Modified: tomcat/tc8.5.x/trunk/webapps/docs/config/cluster-interceptor.xml Modified: tomcat/tc8.5.x/trunk/webapps/docs/config/cluster-interceptor.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/config/cluster-interceptor.xml?rev=1738726&r1=1738725&r2=1738726&view=diff == --- tomcat/tc8.5.x/trunk/webapps/docs/config/cluster-interceptor.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/config/cluster-interceptor.xml Tue Apr 12 08:01:20 2016 @@ -67,9 +67,6 @@ so they will have the same level of notification mechanism as the members that are automatically discovered.
svn commit: r1738727 - /tomcat/tc8.0.x/trunk/webapps/docs/config/cluster-interceptor.xml
Author: kfujino Date: Tue Apr 12 08:02:49 2016 New Revision: 1738727 URL: http://svn.apache.org/viewvc?rev=1738727&view=rev Log: Fix LocalMember attributes and sample config in interceptor documnent. Modified: tomcat/tc8.0.x/trunk/webapps/docs/config/cluster-interceptor.xml Modified: tomcat/tc8.0.x/trunk/webapps/docs/config/cluster-interceptor.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/config/cluster-interceptor.xml?rev=1738727&r1=1738726&r2=1738727&view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/config/cluster-interceptor.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/config/cluster-interceptor.xml Tue Apr 12 08:02:49 2016 @@ -68,9 +68,6 @@ so they will have the same level of notification mechanism as the members that are automatically discovered.
svn commit: r1738728 - /tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-interceptor.xml
Author: kfujino Date: Tue Apr 12 08:03:45 2016 New Revision: 1738728 URL: http://svn.apache.org/viewvc?rev=1738728&view=rev Log: Fix LocalMember attributes and sample config in interceptor documnent. Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-interceptor.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-interceptor.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-interceptor.xml?rev=1738728&r1=1738727&r2=1738728&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-interceptor.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-interceptor.xml Tue Apr 12 08:03:45 2016 @@ -68,9 +68,6 @@ so they will have the same level of notification mechanism as the members that are automatically discovered.
[GUMP@vmgump]: Project tomcat-trunk-test-apr (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-test-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 3 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/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 failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 48 mins 44 secs 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-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160412-native-src.tar.gz -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20160412/lib -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160412.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160412-nat ive-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20160412/bin/openssl -Dexecute.test.apr=true -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-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/pub
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.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-tc7.0.x-test-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 17 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-apr : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -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. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 38 mins 32 secs 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 -Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dtest.temp=output/test-tmp-APR -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 -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160412.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Dtest.excludePerformance=true -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=true -Dexec ute.test.bio=false -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160412-native-src.tar.gz -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160412-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-12/dest-20160412/lib -Dexecute.test.nio=false -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160412.jar -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/to
Re: [VOTE] Release Apache Tomcat 7.0.69
2016-04-11 13:55 GMT+03:00 Violeta Georgieva : > > The proposed Apache Tomcat 7.0.69 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.69/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1074/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_69/ > > The proposed 7.0.69 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 7.0.69 Stable Tested Tomcat in OSGi environment - successful. Basic performance tests - successful. > Regards, > Violeta
svn commit: r1738760 - /tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
Author: markt
Date: Tue Apr 12 10:59:34 2016
New Revision: 1738760
URL: http://svn.apache.org/viewvc?rev=1738760&view=rev
Log:
getPushBuilder() needs to delegate to wrapped Request by default
Modified:
tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java?rev=1738760&r1=1738759&r2=1738760&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
(original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java Tue Apr
12 10:59:34 2016
@@ -396,4 +396,18 @@ public class HttpServletRequestWrapper e
public boolean isPushSupported() {
return this._getHttpServletRequest().isPushSupported();
}
+
+
+/**
+ * {@inheritDoc}
+ *
+ * The default behavior of this method is to return
+ * {@link HttpServletRequest#getPushBuilder()} on the wrapped request
object.
+ *
+ * @since Servlet 4.0
+ */
+@Override
+public PushBuilder getPushBuilder() {
+return this._getHttpServletRequest().getPushBuilder();
+}
}
-
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/1257 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] 1738760 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: r1738792 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
Author: markt Date: Tue Apr 12 12:29:37 2016 New Revision: 1738792 URL: http://svn.apache.org/viewvc?rev=1738792&view=rev Log: White space police Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1738792&r1=1738791&r2=1738792&view=diff == --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java Tue Apr 12 12:29:37 2016 @@ -166,7 +166,6 @@ public class ChannelCoordinator extends getClusterReceiver().getPort(), getClusterReceiver().getSecurePort(), getClusterReceiver().getUdpPort()); - } valid = true; } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 59310] New: Content-Length of HEAD requests incorrectly computed as 0
https://bz.apache.org/bugzilla/show_bug.cgi?id=59310 Bug ID: 59310 Summary: Content-Length of HEAD requests incorrectly computed as 0 Product: Tomcat 7 Version: 7.0.62 Hardware: All OS: All Status: NEW Severity: normal Priority: P2 Component: Connectors Assignee: dev@tomcat.apache.org Reporter: tobias.oberl...@sap.com When responding to a HEAD request without streaming the entity and without setting the Content-Length, the Content-Length is incorrectly computed to be zero in org.apache.catalina.connector.OutputBuffer.close(). This is incorrect. The Content-Length header should be unset in this case. RFC 7230 doesn't require the Content-Length to be set on HEAD requests, but if it set it must be the size of the corresponding GET. So "Content-Length: 0" violates the standard. Computing the real size would be excessively expensive in our use case because this would require to transfer data from a backend system. -- 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 59310] Content-Length of HEAD requests incorrectly computed as
https://bz.apache.org/bugzilla/show_bug.cgi?id=59310
Christopher Schultz changed:
What|Removed |Added
Status|NEW |NEEDINFO
--- Comment #1 from Christopher Schultz ---
So a servlet like this will cause Tomcat to return "Content-Length: 0"?
public class TestServlet extends HttpServlet {
public void doHead(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException {
response.getWriter().close();
}
}
--
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 59310] Content-Length of HEAD requests incorrectly computed as
https://bz.apache.org/bugzilla/show_bug.cgi?id=59310 Tobias Oberlies changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #2 from Tobias Oberlies --- (In reply to Christopher Schultz from comment #1) > So a servlet like this will cause Tomcat to return "Content-Length: 0"? Yes, exactly. The same happens without the close() call. -- 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: r1738816 - in /tomcat/trunk/java/org/apache/catalina/tribes: ChannelInterceptor.java group/ChannelCoordinator.java group/ChannelInterceptorBase.java
Author: remm
Date: Tue Apr 12 15:43:45 2016
New Revision: 1738816
URL: http://svn.apache.org/viewvc?rev=1738816&view=rev
Log:
Style fixes.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java?rev=1738816&r1=1738815&r2=1738816&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java Tue
Apr 12 15:43:45 2016
@@ -176,7 +176,7 @@ public interface ChannelInterceptor exte
/**
* Set the channel that is related to this interceptor
- * @param channel
+ * @param channel The channel
*/
public void setChannel(Channel channel);
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1738816&r1=1738815&r2=1738816&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
Tue Apr 12 15:43:45 2016
@@ -166,7 +166,6 @@ public class ChannelCoordinator extends
getClusterReceiver().getPort(),
getClusterReceiver().getSecurePort(),
getClusterReceiver().getUdpPort());
-
}
valid = true;
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java?rev=1738816&r1=1738815&r2=1738816&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
Tue Apr 12 15:43:45 2016
@@ -189,7 +189,7 @@ public abstract class ChannelInterceptor
/**
* Set the channel that is related to this interceptor
- * @param channel
+ * @param channel The channel
*/
@Override
public void setChannel(Channel channel) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1738817 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/tribes/ChannelInterceptor.java java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
Author: remm
Date: Tue Apr 12 15:44:47 2016
New Revision: 1738817
URL: http://svn.apache.org/viewvc?rev=1738817&view=rev
Log:
Style fixes.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 15:44:47 2016
@@ -1 +1 @@
-/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,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643
+/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,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java?rev=1738817&r1=1738816&r2=1738817&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
Tue Apr 12 15:44:47 2016
@@ -176,7 +176,7 @@ public interface ChannelInterceptor exte
/**
* Set the channel that is related to this interceptor
- * @param channel
+ * @param channel The channel
*/
public void setChannel(Channel channel);
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java?rev=1738817&r1=1738816&r2=1738817&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
Tue Apr 12 15:44:47 2016
@@ -189,7 +189,7 @@ public abstract class ChannelInterceptor
/**
* Set the channel that is related to this interceptor
- * @param channel
+ * @param channel The channel
*/
@Override
public void setChannel(Channel channel) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1738818 - in /tomcat/tc8.5.x/trunk: conf/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/mapper/ java/org/apache/catalina/security/ java/org/a
Author: markt
Date: Tue Apr 12 15:54:46 2016
New Revision: 1738818
URL: http://svn.apache.org/viewvc?rev=1738818&view=rev
Log:
Create a dedicated package to access Servlet 4.0 features.
Ensure the HTTP/2 push example works under a security manager.
Added:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationMapping.java
- copied, changed from r1738650,
tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/GenericFilter.java
- copied, changed from r1738622,
tomcat/trunk/java/javax/servlet/GenericFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/RequestDispatcher.java
(with props)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/ (with
props)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpFilter.java
- copied, changed from r1738622,
tomcat/trunk/java/javax/servlet/http/HttpFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequest.java
(with props)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequestWrapper.java
- copied, changed from r1738622,
tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/Mapping.java
- copied, changed from r1738622,
tomcat/trunk/java/javax/servlet/http/Mapping.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/MappingMatch.java
- copied, changed from r1738622,
tomcat/trunk/java/javax/servlet/http/MappingMatch.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/PushBuilder.java
- copied, changed from r1738622,
tomcat/trunk/java/javax/servlet/http/PushBuilder.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/package-info.java
(with props)
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationMapping.java
- copied, changed from r1738622,
tomcat/trunk/test/org/apache/catalina/core/TestApplicationMapping.java
Modified:
tomcat/tc8.5.x/trunk/conf/catalina.policy
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/RequestFacade.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/mapper/Mapper.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/mapper/MappingData.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
Modified: tomcat/tc8.5.x/trunk/conf/catalina.policy
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/conf/catalina.policy?rev=1738818&r1=1738817&r2=1738818&view=diff
==
--- tomcat/tc8.5.x/trunk/conf/catalina.policy (original)
+++ tomcat/tc8.5.x/trunk/conf/catalina.policy Tue Apr 12 15:54:46 2016
@@ -189,6 +189,10 @@ grant {
// Applications using WebSocket need to be able to access these packages
permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.tomcat.websocket";
permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.tomcat.websocket.server";
+
+// Applications need to access these packages to use the Servlet 4.0
Preview
+permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina.servlet4preview";
+permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.catalina.servlet4preview.http";
};
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1738818&r1=1738817&r2=1738818&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java Tue
Apr 12 15:54:46 2016
@@ -74,11 +74,14 @@ import org.apache.catalina.Realm;
import org.apache.catalina.Session;
import org.apache.catalina.TomcatPrincipal;
import org.apache.catalina.Wrapper;
+import org.apache.catalina.core.ApplicationMapping;
import org.apache.catalina.core.ApplicationPart;
import org.apache.catalina.core.ApplicationPushBuilder;
import org.apache.catalina.core.ApplicationSession
svn commit: r1738821 - /tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html
Author: markt Date: Tue Apr 12 15:59:52 2016 New Revision: 1738821 URL: http://svn.apache.org/viewvc?rev=1738821&view=rev Log: Note the Servlet 4 is early preview in 8.5.x Modified: tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html Modified: tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html?rev=1738821&r1=1738820&r2=1738821&view=diff == --- tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html (original) +++ tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html Tue Apr 12 15:59:52 2016 @@ -167,10 +167,10 @@ for clarity. - Servlet 4.0 Server Push examples + Servlet 4.0 Early Preview examples - Simple image push + HTTP/2 server push Execute - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 59310] Content-Length of HEAD requests incorrectly computed as
https://bz.apache.org/bugzilla/show_bug.cgi?id=59310 --- Comment #3 from Christopher Schultz --- Would you mind testing quickly with 8.0.33? -- 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
[GitHub] tomcat pull request: Honour server side precompressed format prefe...
GitHub user gmokki opened a pull request: https://github.com/apache/tomcat/pull/30 Honour server side precompressed format preference ... when client sends multiple accepted encodings with same quality (which all common browsers do). The goal here is to serve brotli encoded files with the default precompressed=true configuration if both .gz and .br files are present. If browser indicates a preferred order with quality values then that still takes precedence. You can merge this pull request into a Git repository by running: $ git pull https://github.com/NitorCreations/tomcat honour-serverside-encoding-preference Alternatively you can review and apply these changes as the patch at: https://github.com/apache/tomcat/pull/30.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #30 commit 6eb842d316a7fdb608c28a7b5c7eebb30b24c20b Author: Mikko Tiihonen Date: 2016-04-12T16:02:22Z Honour server side precompressed format preference when client sends multiple accepted encodings with same quality --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
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/1258 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] 1738816 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
[GitHub] tomcat pull request: Fix mount base path error, when add directory...
GitHub user hengyunabc opened a pull request: https://github.com/apache/tomcat/pull/31 Fix mount base path error, when add directory into WebResourceRoot You can merge this pull request into a Git repository by running: $ git pull https://github.com/hengyunabc/tomcat trunk Alternatively you can review and apply these changes as the patch at: https://github.com/apache/tomcat/pull/31.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #31 commit c297a6673e8f9f54233e54edb01b3ce0edd73cb5 Author: hengyunabc Date: 2016-04-12T18:15:37Z Fix mount base path error, when add directory into WebResourceRoot --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1738844 - /tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
Author: markt
Date: Tue Apr 12 18:35:00 2016
New Revision: 1738844
URL: http://svn.apache.org/viewvc?rev=1738844&view=rev
Log:
Sync failing (with APR on Gump) test with trunk to add possible work-around
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java?rev=1738844&r1=1738843&r2=1738844&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
Tue Apr 12 18:35:00 2016
@@ -51,7 +51,6 @@ import org.apache.juli.logging.LogFactor
/**
* Test the behavior of closing websockets under various conditions.
*/
-//@Ignore // Only because they don't pass at the moment.
public class TestClose extends TomcatBaseTest {
private static Log log = LogFactory.getLog(TestClose.class);
@@ -284,8 +283,20 @@ public class TestClose extends TomcatBas
if (events.onMessageSends) {
try {
+int count = 0;
+// The latches above are meant to ensure the correct
+// sequence of events but in some cases, particularly with
+// APR, there is a short delay between the client closing /
+// resetting the connection and the server recognising that
+// fact. This loop tries to ensure that it lasts much
longer
+// than that delay so any close / reset from the client
+// triggers an error here.
+while (count < 10) {
+count++;
session.getBasicRemote().sendText("Test reply");
-} catch (IOException e) {
+Thread.sleep(500);
+}
+} catch (IOException | InterruptedException e) {
// Expected to fail
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/389 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1738844 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: r1738849 - /tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
Author: markt
Date: Tue Apr 12 18:51:33 2016
New Revision: 1738849
URL: http://svn.apache.org/viewvc?rev=1738849&view=rev
Log:
Multi-catch not available
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java?rev=1738849&r1=1738848&r2=1738849&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
Tue Apr 12 18:51:33 2016
@@ -296,7 +296,9 @@ public class TestClose extends TomcatBas
session.getBasicRemote().sendText("Test reply");
Thread.sleep(500);
}
-} catch (IOException | InterruptedException e) {
+} catch (IOException e) {
+// Expected to fail
+} catch (InterruptedException e) {
// Expected to fail
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1738850 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml
Author: markt
Date: Tue Apr 12 18:58:24 2016
New Revision: 1738850
URL: http://svn.apache.org/viewvc?rev=1738850&view=rev
Log:
Correctly configure the base path for a resources directory provided by an
expanded JAR file.
Patch provided by hengyunabc.
This closes #31
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=1738850&r1=1738849&r2=1738850&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue Apr 12
18:58:24 2016
@@ -1693,7 +1693,7 @@ public class ContextConfig implements Li
if (resources.isDirectory()) {
context.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.RESOURCE_JAR,
-"/", file.getAbsolutePath(), null, "/");
+"/", resources.getAbsolutePath(), null, "/");
}
}
} catch (IOException ioe) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1738850&r1=1738849&r2=1738850&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Apr 12 18:58:24 2016
@@ -124,6 +124,10 @@
mapping type information for the current request to reflect discussions
within the EG. (markt)
+
+Correctly configure the base path for a resources directory provided by
+an expanded JAR file. Patch provided by hengyunabc. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1738851 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml
Author: markt
Date: Tue Apr 12 18:59:11 2016
New Revision: 1738851
URL: http://svn.apache.org/viewvc?rev=1738851&view=rev
Log:
Correctly configure the base path for a resources directory provided by an
expanded JAR file.
Patch provided by hengyunabc.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 18:59:11 2016
@@ -1 +1 @@
-/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,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816
+/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,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1738851&r1=1738850&r2=1738851&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Tue Apr 12 18:59:11 2016
@@ -1693,7 +1693,7 @@ public class ContextConfig implements Li
if (resources.isDirectory()) {
context.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.RESOURCE_JAR,
-"/", file.getAbsolutePath(), null, "/");
+"/", resources.getAbsolutePath(), null, "/");
}
}
} catch (IOException ioe) {
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1738851&r1=1738850&r2=1738851&view=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue Apr 12 18:59:11 2016
@@ -119,6 +119,10 @@
can be used to gain early access to Servlet 4.0 features. Note that
this
package will not be present in Tomcat 9. (markt)
+
+Correctly configure the base path for a resources directory provided by
+an expanded JAR file. Patch provided by hengyunabc. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat pull request: Fix mount base path error, when add directory...
Github user asfgit closed the pull request at: https://github.com/apache/tomcat/pull/31 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1738852 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml
Author: markt Date: Tue Apr 12 18:59:32 2016 New Revision: 1738852 URL: http://svn.apache.org/viewvc?rev=1738852&view=rev Log: Correctly configure the base path for a resources directory provided by an expanded JAR file. Patch provided by hengyunabc. 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/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 12 18:59:32 2016 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966 -/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,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,169181
svn commit: r1738855 - in /tomcat/trunk: java/org/apache/catalina/servlets/DefaultServlet.java test/org/apache/catalina/servlets/TestDefaultServlet.java webapps/docs/changelog.xml webapps/docs/default
Author: markt
Date: Tue Apr 12 19:14:11 2016
New Revision: 1738855
URL: http://svn.apache.org/viewvc?rev=1738855&view=rev
Log:
Add the ability to express a server side preference order for precompessed
formats.
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/default-servlet.xml
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1738855&r1=1738854&r2=1738855&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Tue Apr
12 19:14:11 2016
@@ -1098,12 +1098,10 @@ public class DefaultServlet extends Http
Enumeration headers = request.getHeaders("Accept-Encoding");
PrecompressedResource bestResource = null;
double bestResourceQuality = 0;
+int bestResourcePreference = Integer.MAX_VALUE;
while (headers.hasMoreElements()) {
String header = headers.nextElement();
for (String preference : header.split(",")) {
-if (bestResourceQuality >= 1) {
-return bestResource;
-}
double quality = 1;
int qualityIdx = preference.indexOf(';');
if (qualityIdx > 0) {
@@ -1113,7 +,7 @@ public class DefaultServlet extends Http
}
quality =
Double.parseDouble(preference.substring(equalsIdx + 1).trim());
}
-if (quality > bestResourceQuality) {
+if (quality >= bestResourceQuality) {
String encoding = preference;
if (qualityIdx > 0) {
encoding = encoding.substring(0, qualityIdx);
@@ -1122,17 +1120,23 @@ public class DefaultServlet extends Http
if ("identity".equals(encoding)) {
bestResource = null;
bestResourceQuality = quality;
+bestResourcePreference = Integer.MAX_VALUE;
continue;
}
if ("*".equals(encoding)) {
bestResource = precompressedResources.get(0);
bestResourceQuality = quality;
+bestResourcePreference = 0;
continue;
}
-for (PrecompressedResource resource :
precompressedResources) {
+for (int i = 0; i < precompressedResources.size(); ++i) {
+PrecompressedResource resource =
precompressedResources.get(i);
if (encoding.equals(resource.format.encoding)) {
-bestResource = resource;
-bestResourceQuality = quality;
+if (quality > bestResourceQuality || i <
bestResourcePreference) {
+bestResource = resource;
+bestResourceQuality = quality;
+bestResourcePreference = i;
+}
break;
}
}
Modified: tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java?rev=1738855&r1=1738854&r2=1738855&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java Tue
Apr 12 19:14:11 2016
@@ -315,6 +315,62 @@ public class TestDefaultServlet extends
}
/*
+ * Verify preferring of brotli in default configuration for actual Firefox
and Chrome requests.
+ */
+@Test
+public void testBrotliPreference() throws Exception {
+
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File("test/webapp");
+
+long brSize = new File(appDir, "index.html.br").length();
+
+// app dir is relative to server home
+Context ctxt = tomcat.addContext("", appDir.getAbsolutePath());
+Wrapper defaultServlet = Tomcat.addServlet(ctxt, "default",
+DefaultServlet.class.getName());
+defaultServlet.addInitParameter("precompressed", "true");
+
+ctxt.addServletMapping("/", "default");
+ctxt.addMimeMapping("html", "text/html");
+
+tomcat.start();
+
+TestCompressedClient client = new TestCom
svn commit: r1738856 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/servlets/DefaultServlet.java test/org/apache/catalina/servlets/TestDefaultServlet.java webapps/docs/changelog.xml webapps/d
Author: markt
Date: Tue Apr 12 19:17:59 2016
New Revision: 1738856
URL: http://svn.apache.org/viewvc?rev=1738856&view=rev
Log:
Add the ability to express a server side preference order for pre-compessed
formats.
Based on a patch by gmokki.
This closes #30
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/default-servlet.xml
Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 19:17:59 2016
@@ -1 +1 @@
-/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,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850
+/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,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1738856&r1=1738855&r2=1738856&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Tue Apr 12 19:17:59 2016
@@ -1098,12 +1098,10 @@ public class DefaultServlet extends Http
Enumeration headers = request.getHeaders("Accept-Encoding");
PrecompressedResource bestResource = null;
double bestResourceQuality = 0;
+int bestResourcePreference = Integer.MAX_VALUE;
while (headers.hasMoreElements()) {
String header = headers.nextElement();
for (String preference : header.split(",")) {
-if (bestResourceQuality >= 1) {
-return bestResource;
-}
double quality = 1;
int qualityIdx = preference.indexOf(';');
if (qualityIdx > 0) {
@@ -1113,7 +,7 @@ public class DefaultServlet extends Http
}
quality =
Double.parseDouble(preference.substring(equalsIdx + 1).trim());
}
-if (quality > bestResourceQuality) {
+if (quality >= bestResourceQuality) {
String encoding = preference;
if (qualityIdx > 0) {
encoding = encoding.substring(0, qualityIdx);
@@ -1122,17 +1120,23 @@ public class DefaultServlet extends Http
if ("identity".equals(encoding)) {
bestResource = null;
bestResourceQuality = quality;
+bestResourcePreference = Integer.MAX_VALUE;
continue;
}
if ("*".equals(encoding)) {
bestResource = precompressedResources.get(0);
bestResourceQuality = quality;
+bestResourcePreference = 0;
continue;
}
-for (PrecompressedResource resource :
precompressedResources) {
+for (int i = 0; i < precompressedResources.size(); ++i) {
+PrecompressedResource resource =
precompressedResources.get(i);
if (encoding.equals(resource.format.encoding)) {
-bestResource = resource;
-bestResourceQuality = quality;
+if (quality > bestResourceQuality || i <
bestResourcePreference) {
+bestResource = resource;
+bestResourceQuality = quality;
+bestResourcePreference = i;
+}
break;
}
}
Modified:
tom
buildbot success in on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/390 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1738849 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
buildbot failure in on tomcat-8-trunk
The Buildbot has detected a new failure on builder tomcat-8-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-8-trunk/builds/548 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] 1738852 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
Re: [VOTE] Release Apache Tomcat 7.0.69
On Mon, Apr 11, 2016 at 12:55 PM, Violeta Georgieva wrote: > The proposed Apache Tomcat 7.0.69 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.69/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1074/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_69/ > > The proposed 7.0.69 release is: > [ ] Broken - do not release > [ ] Stable - go ahead and release as 7.0.69 Stable > [X] Stable - go ahead and release as 7.0.69 Stable Tested Apache Wicket native web socket examples. > Regards, > Violeta >
[Bug 58970] http NIO connector crash after update from 8.0.27 to 8.0.30
https://bz.apache.org/bugzilla/show_bug.cgi?id=58970 --- Comment #7 from Mark Thomas --- The problem is with the current connection count tracking. There are code paths where this isn't being decremented when a connection closes in error. I'm currently looking for a reliable way to track the open connection count. -- 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
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-bio (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-bio 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.0.x-test-bio : 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-bio/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 failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-BIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-BIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-BIO/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-bio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-bio.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-bio (Type: Build) Work ended in a state of : Failed Elapsed: 36 mins 34 secs 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-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160413-native-src.tar.gz -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs -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-20160413.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160413-native-src.tar.gz -Dtest.temp=output/test-tmp-BIO -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.ope nssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20160413/bin/openssl -Dexecute.test.bio=true -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-ap
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (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-nio2 has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 19 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-nio2 : 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-nio2/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 failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 46 mins 34 secs 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-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160413-native-src.tar.gz -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs -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-20160413.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160413-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.o penssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20160413/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=true -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
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (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-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 4 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-apr : 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-apr/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 failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 49 mins 6 secs 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-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160413-native-src.tar.gz -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-12/dest-20160413/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160413.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160413-native-src.tar.gz -Dtest.temp= output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20160413/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=true -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/workspa
[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 Failed'. 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 failed -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: 41 mins 27 secs 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-20160413-native-src.tar.gz -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs -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-20160413.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160413-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true -Dtest.open ssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20160413/bin/openssl -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-ap
