date:20160404

Author: markt
Date: Mon Apr  4 21:41:32 2016
New Revision: 1737749

URL: http://svn.apache.org/viewvc?rev=1737749=rev
Log:
With a minimum version of OpenSSL 1.0.2, these features are always available.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr  4 21:41:32 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
+/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

Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1737749=1737748=1737749=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon 
Apr  4 21:41:32 2016
@@ -417,83 +417,32 @@ public class AprEndpoint extends Abstrac
 sm.getString("endpoint.apr.failSslContextMake"), 
e);
 }
 
-boolean legacyRenegSupported = false;
-try {
-legacyRenegSupported = 
SSL.hasOp(SSL.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
-if (legacyRenegSupported)
-if (sslHostConfig.getInsecureRenegotiation()) {
-SSLContext.setOptions(ctx, 
SSL.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
-} else {
-SSLContext.clearOptions(ctx, 
SSL.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
-}
-} catch (UnsatisfiedLinkError e) {
-// Ignore
-}
-if (!legacyRenegSupported) {
-// OpenSSL does not support unsafe legacy renegotiation.
-log.warn(sm.getString("endpoint.warn.noInsecureReneg",
-  SSL.versionString()));
+if (sslHostConfig.getInsecureRenegotiation()) {
+SSLContext.setOptions(ctx, 
SSL.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
+} else {
+SSLContext.clearOptions(ctx, 
SSL.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
 }
 
 // Use server's preference order for ciphers (rather than
 // client's)
-boolean orderCiphersSupported = false;
-try {
-orderCiphersSupported = 
SSL.hasOp(SSL.SSL_OP_CIPHER_SERVER_PREFERENCE);
-if (orderCiphersSupported) {
-if (sslHostConfig.getHonorCipherOrder()) {
-SSLContext.setOptions(ctx, 
SSL.SSL_OP_CIPHER_SERVER_PREFERENCE);
-} else {
-SSLContext.clearOptions(ctx, 
SSL.SSL_OP_CIPHER_SERVER_PREFERENCE);
-}
-}
-} catch (UnsatisfiedLinkError e) {
-// Ignore
-}
-if (!orderCiphersSupported) {
-// OpenSSL does not support ciphers ordering.
-log.warn(sm.getString("endpoint.warn.noHonorCipherOrder",
-  SSL.versionString()));
+if (sslHostConfig.getHonorCipherOrder()) {
+SSLContext.setOptions(ctx, 
SSL.SSL_OP_CIPHER_SERVER_PREFERENCE);
+} else {
+SSLContext.clearOptions(ctx, 
SSL.SSL_OP_CIPHER_SERVER_PREFERENCE);
 }
 
 // Disable compression if requested
-boolean disableCompressionSupported = false;
-try {
-disableCompressionSupported = 
SSL.hasOp(SSL.SSL_OP_NO_COMPRESSION);
-if (disableCompressionSupported) {
-if (sslHostConfig.getDisableCompression()) {
-SSLContext.setOptions(ctx, 
SSL.SSL_OP_NO_COMPRESSION);
-} else {
-SSLContext.clearOptions(ctx,

svn commit: r1737748 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java LocalStrings.properties

Author: markt
Date: Mon Apr  4 21:40:38 2016
New Revision: 1737748

URL: http://svn.apache.org/viewvc?rev=1737748=rev
Log:
With a minimum version of OpenSSL 1.0.2, these features are always available.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1737748=1737747=1737748=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Apr  4 
21:40:38 2016
@@ -417,83 +417,32 @@ public class AprEndpoint extends Abstrac
 sm.getString("endpoint.apr.failSslContextMake"), 
e);
 }
 
-boolean legacyRenegSupported = false;
-try {
-legacyRenegSupported = 
SSL.hasOp(SSL.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
-if (legacyRenegSupported)
-if (sslHostConfig.getInsecureRenegotiation()) {
-SSLContext.setOptions(ctx, 
SSL.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
-} else {
-SSLContext.clearOptions(ctx, 
SSL.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
-}
-} catch (UnsatisfiedLinkError e) {
-// Ignore
-}
-if (!legacyRenegSupported) {
-// OpenSSL does not support unsafe legacy renegotiation.
-log.warn(sm.getString("endpoint.warn.noInsecureReneg",
-  SSL.versionString()));
+if (sslHostConfig.getInsecureRenegotiation()) {
+SSLContext.setOptions(ctx, 
SSL.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
+} else {
+SSLContext.clearOptions(ctx, 
SSL.SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
 }
 
 // Use server's preference order for ciphers (rather than
 // client's)
-boolean orderCiphersSupported = false;
-try {
-orderCiphersSupported = 
SSL.hasOp(SSL.SSL_OP_CIPHER_SERVER_PREFERENCE);
-if (orderCiphersSupported) {
-if (sslHostConfig.getHonorCipherOrder()) {
-SSLContext.setOptions(ctx, 
SSL.SSL_OP_CIPHER_SERVER_PREFERENCE);
-} else {
-SSLContext.clearOptions(ctx, 
SSL.SSL_OP_CIPHER_SERVER_PREFERENCE);
-}
-}
-} catch (UnsatisfiedLinkError e) {
-// Ignore
-}
-if (!orderCiphersSupported) {
-// OpenSSL does not support ciphers ordering.
-log.warn(sm.getString("endpoint.warn.noHonorCipherOrder",
-  SSL.versionString()));
+if (sslHostConfig.getHonorCipherOrder()) {
+SSLContext.setOptions(ctx, 
SSL.SSL_OP_CIPHER_SERVER_PREFERENCE);
+} else {
+SSLContext.clearOptions(ctx, 
SSL.SSL_OP_CIPHER_SERVER_PREFERENCE);
 }
 
 // Disable compression if requested
-boolean disableCompressionSupported = false;
-try {
-disableCompressionSupported = 
SSL.hasOp(SSL.SSL_OP_NO_COMPRESSION);
-if (disableCompressionSupported) {
-if (sslHostConfig.getDisableCompression()) {
-SSLContext.setOptions(ctx, 
SSL.SSL_OP_NO_COMPRESSION);
-} else {
-SSLContext.clearOptions(ctx, 
SSL.SSL_OP_NO_COMPRESSION);
-}
-}
-} catch (UnsatisfiedLinkError e) {
-// Ignore
-}
-if (!disableCompressionSupported) {
-// OpenSSL does not support ciphers ordering.
-log.warn(sm.getString("endpoint.warn.noDisableCompression",
-  SSL.versionString()));
+if (sslHostConfig.getDisableCompression()) {
+SSLContext.setOptions(ctx, SSL.SSL_OP_NO_COMPRESSION);
+} else {
+SSLContext.clearOptions(ctx, SSL.SSL_OP_NO_COMPRESSION);
 }
 
 // Disable TLS Session Tickets (RFC4507) to protect perfect 
forward secrecy
-boolean disableSessionTicketsSupported = false;
-try {
-

svn commit: r1737747 - in /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net: AbstractEndpoint.java jsse/JSSESocketFactory.java jsse/res/LocalStrings.properties res/LocalStrings.properties

Author: markt
Date: Mon Apr  4 21:27:27 2016
New Revision: 1737747

URL: http://svn.apache.org/viewvc?rev=1737747=rev
Log:
Use newly added JreCompat to handle setting of honorCipherOrder

Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1737747=1737746=1737747=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
Mon Apr  4 21:27:27 2016
@@ -17,8 +17,6 @@
 package org.apache.tomcat.util.net;
 
 import java.io.OutputStreamWriter;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
@@ -33,10 +31,10 @@ import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLParameters;
 
 import org.apache.juli.logging.Log;
 import org.apache.tomcat.util.IntrospectionUtils;
+import org.apache.tomcat.util.compat.JreCompat;
 import org.apache.tomcat.util.net.AbstractEndpoint.Acceptor.AcceptorState;
 import org.apache.tomcat.util.res.StringManager;
 import org.apache.tomcat.util.threads.LimitLatch;
@@ -745,29 +743,12 @@ public abstract class AbstractEndpointhttp://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1737747=1737746=1737747=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
 Mon Apr  4 21:27:27 2016
@@ -20,8 +20,6 @@ package org.apache.tomcat.util.net.jsse;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
@@ -52,7 +50,6 @@ import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.ManagerFactoryParameters;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLServerSocket;
 import javax.net.ssl.SSLServerSocketFactory;
 import javax.net.ssl.SSLSession;
@@ -62,6 +59,7 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509KeyManager;
 
+import org.apache.tomcat.util.compat.JreCompat;
 import org.apache.tomcat.util.compat.JreVendor;
 import org.apache.tomcat.util.file.ConfigFileLoader;
 import org.apache.tomcat.util.net.AbstractEndpoint;
@@ -791,36 +789,10 @@ public class JSSESocketFactory implement
 
 // Only use this feature if the user explicitly requested its use.
 if(!"".equals(useServerCipherSuitesOrderStr)) {
-SSLParameters sslParameters = socket.getSSLParameters();
 boolean useServerCipherSuitesOrder =
 ("true".equalsIgnoreCase(useServerCipherSuitesOrderStr)
 || 
"yes".equalsIgnoreCase(useServerCipherSuitesOrderStr));
-
-try {
-// This method is only available in Java 8+
-// Check to see if the method exists, and then call it.
-Method m = 
SSLParameters.class.getMethod("setUseCipherSuitesOrder",
- Boolean.TYPE);
-
-m.invoke(sslParameters, 
Boolean.valueOf(useServerCipherSuitesOrder));
-}
-catch (NoSuchMethodException nsme) {
-throw new 
UnsupportedOperationException(sm.getString("endpoint.jsse.cannotHonorServerCipherOrder"),
-nsme);
-} catch (InvocationTargetException ite) {
-// Should not happen
-throw new 
UnsupportedOperationException(sm.getString("endpoint.jsse.cannotHonorServerCipherOrder"),
-ite);
-} catch (IllegalArgumentException iae) {
-// Should not happen
-throw new 
UnsupportedOperationException(sm.getString("endpoint.jsse.cannotHonorServerCipherOrder"),
-iae);
-}

svn commit: r1737746 - in /tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat: Jre8Compat.java JreCompat.java

Author: markt
Date: Mon Apr  4 21:09:31 2016
New Revision: 1737746

URL: http://svn.apache.org/viewvc?rev=1737746=rev
Log:
Remove the socket version of setUseCipherOrder since it was only used by BIO 
which has been removed in 8.5.x.

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/Jre8Compat.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/Jre8Compat.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/Jre8Compat.java?rev=1737746=1737745=1737746=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/Jre8Compat.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/Jre8Compat.java Mon 
Apr  4 21:09:31 2016
@@ -21,25 +21,18 @@ import java.lang.reflect.Method;
 
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLParameters;
-import javax.net.ssl.SSLServerSocket;
 
 class Jre8Compat extends JreCompat {
 
-private static final Method getSSLParametersMethod;
 private static final Method setUseCipherSuitesOrderMethod;
-private static final Method setSSLParametersMethod;
 
 
 static {
 Method m1 = null;
-Method m2 = null;
-Method m3 = null;
 try {
 // Get this class first since it is Java 8+ only
-Class c2 = Class.forName("javax.net.ssl.SSLParameters");
-m1 = SSLServerSocket.class.getMethod("getSSLParameters");
-m2 = c2.getMethod("setUseCipherSuitesOrder", boolean.class);
-m3 = SSLServerSocket.class.getMethod("setSSLParameters", c2);
+Class c1 = Class.forName("javax.net.ssl.SSLParameters");
+m1 = c1.getMethod("setUseCipherSuitesOrder", boolean.class);
 } catch (SecurityException e) {
 // Should never happen
 } catch (NoSuchMethodException e) {
@@ -47,9 +40,7 @@ class Jre8Compat extends JreCompat {
 } catch (ClassNotFoundException e) {
 // Should never happen
 }
-getSSLParametersMethod = m1;
-setUseCipherSuitesOrderMethod = m2;
-setSSLParametersMethod = m3;
+setUseCipherSuitesOrderMethod = m1;
 }
 
 
@@ -58,25 +49,6 @@ class Jre8Compat extends JreCompat {
 }
 
 
-@Override
-public void setUseServerCipherSuitesOrder(SSLServerSocket socket,
-boolean useCipherSuitesOrder) {
-try {
-Object sslParameters = getSSLParametersMethod.invoke(socket);
-setUseCipherSuitesOrderMethod.invoke(
-sslParameters, Boolean.valueOf(useCipherSuitesOrder));
-setSSLParametersMethod.invoke(socket, sslParameters);
-return;
-} catch (IllegalArgumentException e) {
-throw new UnsupportedOperationException(e);
-} catch (IllegalAccessException e) {
-throw new UnsupportedOperationException(e);
-} catch (InvocationTargetException e) {
-throw new UnsupportedOperationException(e);
-}
-}
-
-
 @Override
 public void setUseServerCipherSuitesOrder(SSLEngine engine,
 boolean useCipherSuitesOrder) {

Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java?rev=1737746=1737745=1737746=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java Mon 
Apr  4 21:09:31 2016
@@ -17,7 +17,6 @@
 package org.apache.tomcat.util.compat;
 
 import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLServerSocket;
 
 import org.apache.tomcat.util.res.StringManager;
 
@@ -60,13 +59,6 @@ public class JreCompat {
 }
 
 
-@SuppressWarnings("unused")
-public void setUseServerCipherSuitesOrder(SSLServerSocket socket,
-boolean useCipherSuitesOrder) {
-throw new 
UnsupportedOperationException(sm.getString("jreCompat.noServerCipherSuiteOrder"));
-}
-
-
 @SuppressWarnings("unused")
 public void setUseServerCipherSuitesOrder(SSLEngine engine,
 boolean useCipherSuitesOrder) {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1737745 - in /tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net: AbstractJsseEndpoint.java LocalStrings.properties SSLHostConfig.java

Author: markt
Date: Mon Apr  4 21:07:01 2016
New Revision: 1737745

URL: http://svn.apache.org/viewvc?rev=1737745=rev
Log:
Use newly added JreCompat to handle setting of honorCipherOrder

Modified:

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1737745=1737744=1737745=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java 
Mon Apr  4 21:07:01 2016
@@ -16,8 +16,6 @@
  */
 package org.apache.tomcat.util.net;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
@@ -25,9 +23,9 @@ import java.util.List;
 import java.util.Set;
 
 import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLSessionContext;
 
+import org.apache.tomcat.util.compat.JreCompat;
 import org.apache.tomcat.util.net.SSLHostConfig.Type;
 import org.apache.tomcat.util.net.openssl.OpenSSLImplementation;
 import org.apache.tomcat.util.net.openssl.ciphers.Cipher;
@@ -147,23 +145,8 @@ public abstract class AbstractJsseEndpoi
 engine.setEnabledCipherSuites(sslHostConfig.getEnabledCiphers());
 engine.setEnabledProtocols(sslHostConfig.getEnabledProtocols());
 
-SSLParameters sslParameters = engine.getSSLParameters();
-if (sslHostConfig.getHonorCipherOrder()) {
-// SSLParameters#setUseCipherSuiteOrder is java 8 and upwards
-try {
-Method m = SSLParameters.class.getMethod(
-"setUseCipherSuitesOrder", Boolean.TYPE);
-m.invoke(sslParameters, Boolean.TRUE);
-} catch (NoSuchMethodException | SecurityException
-| IllegalAccessException | IllegalArgumentException
-| InvocationTargetException e) {
-throw new UnsupportedOperationException(
-
sm.getString("endpoint.jsse.cannotHonorServerCipherOrder"),
-e);
-}
-}
-// In case the getter returns a defensive copy
-engine.setSSLParameters(sslParameters);
+JreCompat.getInstance().setUseServerCipherSuitesOrder(engine,
+sslHostConfig.getHonorCipherOrder());
 
 return engine;
 }

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1737745=1737744=1737745=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties 
Mon Apr  4 21:07:01 2016
@@ -77,7 +77,6 @@ endpoint.apr.pollUnknownEvent=A socket w
 endpoint.apr.tooManyCertFiles=More certificate files were configured than the 
AprEndpoint can handle
 endpoint.apr.remoteport=APR socket [{0}] opened with remote port [{1}]
 endpoint.jsse.noSslContext=No SSLContext could be found for the host name [{0}]
-endpoint.jsse.cannotHonorServerCipherOrder=Java Runtime does not support 
"useServerCipherSuitesOrder". You must use Java 8 or later to use this feature.
 endpoint.nio.selectorCloseFail=Failed to close selector when closing the poller
 endpoint.nio.timeoutCme=Exception during processing of timeouts. The code has 
been checked repeatedly and no concurrent modification has been found. If you 
are able to repeat this error please open a Tomcat bug and provide the steps to 
reproduce.
 endpoint.nio2.exclusiveExecutor=The NIO2 connector requires an exclusive 
executor to operate properly on shutdown

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1737745=1737744=1737745=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Mon 
Apr  4 21:07:01 2016
@@ -25,7 +25,6 @@ import java.util.Map;
 import java.util.Set;
 
 import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLParameters;
 import javax.net.ssl.TrustManagerFactory;
 
 import

buildbot success in on tomcat-7-trunk

2016-04-04 Thread buildbot

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/375

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] 1737722
Blamelist: violetagg

Build succeeded!

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Maven snapshot builds

2016-04-04 Thread Violeta Georgieva

Hi,

2016-04-02 10:27 GMT+03:00 Mark Thomas :
>
> On 1 April 2016 21:07:37 BST, Martin Grigorov 
wrote:
> >Hi,
> >
> >Does anyone know what is the reason for the missing -SNAPSHOT builds at
> >
https://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/tomcat-catalina/
> >(RAO) ?
>
> Snapshots aren't automated. They need to be triggered manually by a
committer.
>
> >https://tomcat.apache.org/tomcat-8.5-doc/maven-jars.html says that the
> >snapshots should be at
> >http://people.apache.org/repo/m2-snapshot-repository/org/apache/tomcat/
> >but
> >this gives 404.
>
> That doc needs to be updated to reflect that snapshots moved to
repository.apache.org
>

I updated the docs.

Regards,
Violeta

> >The last 8.0-SNAPSHOT at RAO is from Feb 23th.
> >I actually need 8.5-SNAPSHOT with the fix for ClassCastException when
> >trying to get the ApplicationPushBuilder.
> >
> >Another option for me is to build and install the Maven jars locally.
> >Any
> >hints for the Ant commands to do this ?
>
> README in res/maven
>
> Mark
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

svn commit: r1737729 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/maven-jars.xml

Author: violetagg
Date: Mon Apr  4 18:53:37 2016
New Revision: 1737729

URL: http://svn.apache.org/viewvc?rev=1737729=rev
Log:
Merged revision 1737715 from tomcat/trunk:
Update in the documentation the link to the maven repository where Tomcat 
snapshot artifacts are deployed.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/maven-jars.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr  4 18:53:37 2016
@@ -1,4 +1,4 @@
 
/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989
 
,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672,1727903,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253
 
/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800,1723130,1724434,1724674,1724792,1724803,1725929,1725963-1725965,1725970,1725974,1726172,1726175,1726179-1726182,1726195-1726198,1726200,1726203,1726226,1726576,1726630,1727029,1727037,1727671,1727900,1728449,1729362,1731009,1731955,1731977,1732360,1732672,1733941,1734115,1734133,1734531
 /tomcat/tc8.5.x/trunk:1737199
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770

svn commit: r1737722 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/maven-jars.xml

Author: violetagg
Date: Mon Apr  4 18:35:34 2016
New Revision: 1737722

URL: http://svn.apache.org/viewvc?rev=1737722=rev
Log:
Merged revision 1737715 from tomcat/trunk:
Update in the documentation the link to the maven repository where Tomcat 
snapshot artifacts are deployed.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/maven-jars.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr  4 18:35:34 2016
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1726171-1726173,1
 
726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286
 /tomcat/tc8.5.x/trunk:1735579,1736839,1737199

svn commit: r1737720 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/maven-jars.xml

Author: violetagg
Date: Mon Apr  4 18:28:04 2016
New Revision: 1737720

URL: http://svn.apache.org/viewvc?rev=1737720=rev
Log:
Merged revision 1737715 from tomcat/trunk:
Update in the documentation the link to the maven repository where Tomcat 
snapshot artifacts are deployed.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.0.x/trunk/webapps/docs/maven-jars.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr  4 18:28:04 2016
@@ -1,2 +1,2 @@
 /tomcat/tc8.5.x/trunk:1735042
-/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

svn commit: r1737717 - in /tomcat/tc8.5.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/maven-jars.xml

Author: violetagg
Date: Mon Apr  4 18:23:47 2016
New Revision: 1737717

URL: http://svn.apache.org/viewvc?rev=1737717=rev
Log:
Merged revision 1737715 from tomcat/trunk:
Update in the documentation the link to the maven repository where Tomcat 
snapshot artifacts are deployed.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/maven-jars.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr  4 18:23: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
+/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

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=1737717=1737716=1737717=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Apr  4 18:23:47 2016
@@ -149,6 +149,10 @@
 Remove button that has accidentally been added to the host manager.
 Submitted by Coty Sutherland. (remm)
   
+  
+Update in the documentation the link to the maven repository where
+Tomcat snapshot artifacts are deployed. (markt/violetagg)
+  
 
   
   

Modified: tomcat/tc8.5.x/trunk/webapps/docs/maven-jars.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/maven-jars.xml?rev=1737717=1737716=1737717=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/maven-jars.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/maven-jars.xml Mon Apr  4 18:23:47 2016
@@ -36,8 +36,8 @@
 
 
   Tomcat snapshots are located in the
-  http://people.apache.org/repo/m2-snapshot-repository/org/apache/tomcat/;>Apache
 Snapshot Repository.
-  The official URL is 
http://people.apache.org/repo/m2-snapshot-repository/org/apache/tomcat/
+  http://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/;>Apache
 Snapshot Repository.
+  The official URL is 
http://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/
   
 Snapshots are done periodically, not on a regular basis, but when 
changes happen and the Tomcat team deems a new snapshot might
 useful.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1737715 - in /tomcat/trunk/webapps/docs: changelog.xml maven-jars.xml

Author: violetagg
Date: Mon Apr  4 18:20:57 2016
New Revision: 1737715

URL: http://svn.apache.org/viewvc?rev=1737715=rev
Log:
Update in the documentation the link to the maven repository where Tomcat 
snapshot artifacts are deployed.

Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/maven-jars.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1737715=1737714=1737715=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Apr  4 18:20:57 2016
@@ -154,6 +154,10 @@
 Remove button that has accidentally been added to the host manager.
 Submitted by Coty Sutherland. (remm)
   
+  
+Update in the documentation the link to the maven repository where
+Tomcat snapshot artifacts are deployed. (markt/violetagg)
+  
 
   
   

Modified: tomcat/trunk/webapps/docs/maven-jars.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/maven-jars.xml?rev=1737715=1737714=1737715=diff
==
--- tomcat/trunk/webapps/docs/maven-jars.xml (original)
+++ tomcat/trunk/webapps/docs/maven-jars.xml Mon Apr  4 18:20:57 2016
@@ -36,8 +36,8 @@
 
 
   Tomcat snapshots are located in the
-  http://people.apache.org/repo/m2-snapshot-repository/org/apache/tomcat/;>Apache
 Snapshot Repository.
-  The official URL is 
http://people.apache.org/repo/m2-snapshot-repository/org/apache/tomcat/
+  http://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/;>Apache
 Snapshot Repository.
+  The official URL is 
http://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/
   
 Snapshots are done periodically, not on a regular basis, but when 
changes happen and the Tomcat team deems a new snapshot might
 useful.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 59270] Regression with Spring with AspectJ Load-Time Weaving

https://bz.apache.org/bugzilla/show_bug.cgi?id=59270

Violeta Georgieva  changed:

   What|Removed |Added

 OS||All
 Status|NEW |NEEDINFO

--- Comment #1 from Violeta Georgieva  ---
Hi,

I do not observe this issue.

I'm testing with Tomcat 8.0.33 and examples application and I clearly see

org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader
TomcatInstrumentableClassLoader
  context: examples
  delegate: false
--> Parent Classloader:
java.net.URLClassLoader@34ce8af7


Regards,
Violeta

PP: I found the note below in the Spring Framework javadoc
http://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.html

NOTE: Requires Apache Tomcat version 6.0 or higher, as of Spring 4.0. This
class is not intended to work on Tomcat 8.0+; please rely on Tomcat's own
InstrumentableClassLoader facility instead, as autodetected by Spring's
TomcatLoadTimeWeaver.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot failure in on tomcat-7-trunk

2016-04-04 Thread buildbot

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/374

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] 1737671
Blamelist: violetagg

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] tomcat-maven-plugin pull request: Support Alternate Session Manage...

2016-04-04 Thread jbcpollak

Github user jbcpollak closed the pull request at:

https://github.com/apache/tomcat-maven-plugin/pull/5


---
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: r1737671 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/StandardHostValve.java webapps/docs/changelog.xml

Author: violetagg
Date: Mon Apr  4 12:14:19 2016
New Revision: 1737671

URL: http://svn.apache.org/viewvc?rev=1737671=rev
Log:
Merged revision 1737664 from tomcat/trunk:
Ensure the exceptions caused by Valves/Authenticators will be available in the 
log files so that they can be evaluated when 
o.a.catalina.valves.ErrorReportValve.showReport=false. Patch is provided by 
Svetlin Zarev via mailing list 
http://marc.info/?l=tomcat-user=145951730303576=2

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr  4 12:14:19 2016
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1726171-1726173,1
 
726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286
 /tomcat/tc8.5.x/trunk:1735579,1736839,1737199

svn commit: r1737670 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/StandardHostValve.java webapps/docs/changelog.xml

Author: violetagg
Date: Mon Apr  4 12:11:05 2016
New Revision: 1737670

URL: http://svn.apache.org/viewvc?rev=1737670=rev
Log:
Merged revision 1737664 from tomcat/trunk:
Ensure the exceptions caused by Valves/Authenticators will be available in the 
log files so that they can be evaluated when 
o.a.catalina.valves.ErrorReportValve.showReport=false. Patch is provided by 
Svetlin Zarev via mailing list 
http://marc.info/?l=tomcat-user=145951730303576=2

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr  4 12:11:05 2016
@@ -1,2 +1,2 @@
 /tomcat/tc8.5.x/trunk:1735042
-/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

svn commit: r1737666 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/StandardHostValve.java webapps/docs/changelog.xml

Author: violetagg
Date: Mon Apr  4 12:08:00 2016
New Revision: 1737666

URL: http://svn.apache.org/viewvc?rev=1737666=rev
Log:
Merged revision 1737664 from tomcat/trunk:
Ensure the exceptions caused by Valves/Authenticators will be available in the 
log files so that they can be evaluated when 
o.a.catalina.valves.ErrorReportValve.showReport=false. Patch is provided by 
Svetlin Zarev via mailing list 
http://marc.info/?l=tomcat-user=145951730303576=2

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr  4 12:08:00 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
+/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

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=1737666=1737665=1737666=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardHostValve.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardHostValve.java 
Mon Apr  4 12:08:00 2016
@@ -147,13 +147,10 @@ final class StandardHostValve extends Va
 }
 } catch (Throwable t) {
 ExceptionUtils.handleThrowable(t);
+container.getLogger().error("Exception Processing " + 
request.getRequestURI(), t);
 // If a new error occurred while trying to report a previous
-// error simply log the new error and allow the original error
-// to be reported.
-if (response.isErrorReportRequired()) {
-container.getLogger().error("Exception Processing " +
-request.getRequestURI(), t);
-} else {
+// error allow the original error to be reported.
+if (!response.isErrorReportRequired()) {
 request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, t);
 throwable(request, response, t);
 }

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=1737666=1737665=1737666=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Apr  4 12:08:00 2016
@@ -86,6 +86,12 @@
 attributes in WebServlet and WebFilter annotations is not allowed.
 (violetagg)
   
+  
+Ensure the exceptions caused by Valves will be available in the log
+files so that they can be evaluated when
+o.a.catalina.valves.ErrorReportValve.showReport is
+disabled. Patch is provided by Svetlin Zarev. (violetagg)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1737664 - in /tomcat/trunk: java/org/apache/catalina/core/StandardHostValve.java webapps/docs/changelog.xml

Author: violetagg
Date: Mon Apr  4 12:04:38 2016
New Revision: 1737664

URL: http://svn.apache.org/viewvc?rev=1737664=rev
Log:
Ensure the exceptions caused by Valves/Authenticators will be available in the 
log files so that they can be evaluated when 
o.a.catalina.valves.ErrorReportValve.showReport=false. Patch is provided by 
Svetlin Zarev via mailing list 
http://marc.info/?l=tomcat-user=145951730303576=2

Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=1737664=1737663=1737664=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java Mon Apr  
4 12:04:38 2016
@@ -147,13 +147,10 @@ final class StandardHostValve extends Va
 }
 } catch (Throwable t) {
 ExceptionUtils.handleThrowable(t);
+container.getLogger().error("Exception Processing " + 
request.getRequestURI(), t);
 // If a new error occurred while trying to report a previous
-// error simply log the new error and allow the original error
-// to be reported.
-if (response.isErrorReportRequired()) {
-container.getLogger().error("Exception Processing " +
-request.getRequestURI(), t);
-} else {
+// error allow the original error to be reported.
+if (!response.isErrorReportRequired()) {
 request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, t);
 throwable(request, response, t);
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1737664=1737663=1737664=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Apr  4 12:04:38 2016
@@ -96,6 +96,12 @@
 attributes in WebServlet and WebFilter annotations is not allowed.
 (violetagg)
   
+  
+Ensure the exceptions caused by Valves will be available in the log
+files so that they can be evaluated when
+o.a.catalina.valves.ErrorReportValve.showReport is
+disabled. Patch is provided by Svetlin Zarev. (violetagg)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 56126] 8.0.1 Regression with Spring with AspectJ Load-Time Weaving

https://bz.apache.org/bugzilla/show_bug.cgi?id=56126

--- Comment #10 from Andrei Ivanov  ---
Done, see 59270

-- 
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 59270] New: Regression with Spring with AspectJ Load-Time Weaving

https://bz.apache.org/bugzilla/show_bug.cgi?id=59270

Bug ID: 59270
   Summary: Regression with Spring with AspectJ Load-Time Weaving
   Product: Tomcat 8
   Version: 8.0.33
  Hardware: PC
Status: NEW
  Severity: regression
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: andrei.iva...@gmail.com

It looks like the custom class loader isn't getting used anymore in 8.0.33.

With spring-instrument-tomcat-4.2.5.RELEASE.jar in the Tomcat lib folder and 




in the context.xml of the web application.

Deployed in 8.0.22, I see TomcatInstrumentableClassLoader getting invoked
immediately when the app starts deploying and no calls in 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

svn commit: r1737647 - in /tomcat/native/trunk/native: include/ssl_private.h src/ssl.c

2016-04-04 Thread rjung

Author: rjung
Date: Mon Apr  4 09:48:28 2016
New Revision: 1737647

URL: http://svn.apache.org/viewvc?rev=1737647=rev
Log:
Support for OpenSSL 1.1.0:
- BIO was made opaque post OpenSSL 1.1.0-pre4.

Modified:
tomcat/native/trunk/native/include/ssl_private.h
tomcat/native/trunk/native/src/ssl.c

Modified: tomcat/native/trunk/native/include/ssl_private.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/ssl_private.h?rev=1737647=1737646=1737647=diff
==
--- tomcat/native/trunk/native/include/ssl_private.h (original)
+++ tomcat/native/trunk/native/include/ssl_private.h Mon Apr  4 09:48:28 2016
@@ -213,6 +213,11 @@
 #define OPENSSL_malloc_init CRYPTO_malloc_init
 #define X509_REVOKED_get0_serialNumber(x) x->serialNumber
 #define OpenSSL_version_num SSLeay
+#define BIO_get_init(x)   (x->init)
+#define BIO_set_init(x,v) (x->init=v)
+#define BIO_get_data(x)   (x->ptr)
+#define BIO_set_data(x,v) (x->ptr=v)
+#define BIO_set_shutdown(x,v) (x->shutdown=v)
 #endif /* OPENSSL_VERSION_NUMBER < 0x1010L */
 
 #define MAX_ALPN_NPN_PROTO_SIZE 65535

Modified: tomcat/native/trunk/native/src/ssl.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1737647=1737646=1737647=diff
==
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Mon Apr  4 09:48:28 2016
@@ -266,6 +266,11 @@ DH *SSL_get_dh_params(unsigned keylen)
 return NULL; /* impossible to reach. */
 }
 
+#if OPENSSL_VERSION_NUMBER >= 0x1010L
+static void init_bio_methods(void);
+static void free_bio_methods(void);
+#endif
+
 TCN_IMPLEMENT_CALL(jint, SSL, version)(TCN_STDARGS)
 {
 UNREFERENCED_STDARGS;
@@ -296,6 +301,9 @@ static apr_status_t ssl_init_cleanup(voi
  tcn_password_callback.cb.obj);
 }
 
+#if OPENSSL_VERSION_NUMBER >= 0x1010L
+free_bio_methods();
+#endif
 free_dh_params();
 
 /*
@@ -729,6 +737,9 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize
 SSL_init_app_data2_3_idx();
 
 init_dh_params();
+#if OPENSSL_VERSION_NUMBER >= 0x1010L
+init_bio_methods();
+#endif
 
 /*
  * Let us cleanup the ssl library when the library is unloaded
@@ -849,10 +860,11 @@ static apr_status_t generic_bio_cleanup(
 
 void SSL_BIO_close(BIO *bi)
 {
+BIO_JAVA *j;
 if (bi == NULL)
 return;
-if (bi->ptr != NULL && (bi->flags & SSL_BIO_FLAG_CALLBACK)) {
-BIO_JAVA *j = (BIO_JAVA *)bi->ptr;
+j = (BIO_JAVA *)BIO_get_data(bi);
+if (j != NULL && BIO_test_flags(bi, SSL_BIO_FLAG_CALLBACK)) {
 j->refcount--;
 if (j->refcount == 0) {
 if (j->pool)
@@ -867,10 +879,11 @@ void SSL_BIO_close(BIO *bi)
 
 void SSL_BIO_doref(BIO *bi)
 {
+BIO_JAVA *j;
 if (bi == NULL)
 return;
-if (bi->ptr != NULL && (bi->flags & SSL_BIO_FLAG_CALLBACK)) {
-BIO_JAVA *j = (BIO_JAVA *)bi->ptr;
+j = (BIO_JAVA *)BIO_get_data(bi);
+if (j != NULL && BIO_test_flags(bi, SSL_BIO_FLAG_CALLBACK)) {
 j->refcount++;
 }
 }
@@ -884,37 +897,44 @@ static int jbs_new(BIO *bi)
 return 0;
 j->pool  = NULL;
 j->refcount  = 1;
-bi->shutdown = 1;
-bi->init = 0;
+BIO_set_shutdown(bi, 1);
+BIO_set_init(bi, 0);
+#if OPENSSL_VERSION_NUMBER < 0x1010L
+/* No setter method for OpenSSL 1.1.0 available,
+ * but I can't find any functional use of the
+ * "num" field there either.
+ */
 bi->num  = -1;
-bi->ptr  = (char *)j;
+#endif
+BIO_set_data(bi, (void *)j);
 
 return 1;
 }
 
 static int jbs_free(BIO *bi)
 {
+BIO_JAVA *j;
 if (bi == NULL)
 return 0;
-if (bi->ptr != NULL) {
-BIO_JAVA *j = (BIO_JAVA *)bi->ptr;
-if (bi->init) {
+j = (BIO_JAVA *)BIO_get_data(bi);
+if (j != NULL) {
+if (BIO_get_init(bi)) {
 JNIEnv   *e = NULL;
-bi->init = 0;
+BIO_set_init(bi, 0);
 tcn_get_java_env();
 TCN_UNLOAD_CLASS(e, j->cb.obj);
 }
-OPENSSL_free(bi->ptr);
+OPENSSL_free(j);
 }
-bi->ptr = NULL;
+BIO_set_data(bi, NULL);
 return 1;
 }
 
 static int jbs_write(BIO *b, const char *in, int inl)
 {
 jint ret = -1;
-if (b->init && in != NULL) {
-BIO_JAVA *j = (BIO_JAVA *)b->ptr;
+if (BIO_get_init(b) && in != NULL) {
+BIO_JAVA *j = (BIO_JAVA *)BIO_get_data(b);
 JNIEnv   *e = NULL;
 jbyteArray jb;
 tcn_get_java_env();
@@ -939,8 +959,8 @@ static int jbs_write(BIO *b, const char
 static int jbs_read(BIO *b, char *out, int outl)
 {
 jint ret = 0;
-if (b->init && out != NULL) {
-BIO_JAVA *j = (BIO_JAVA *)b->ptr;
+if (BIO_get_init(b) && out != NULL) {
+BIO_JAVA *j = (BIO_JAVA *)BIO_get_data(b);
 JNIEnv   *e = NULL;

svn commit: r1737646 - /tomcat/native/trunk/native/src/sslcontext.c

2016-04-04 Thread rjung

Author: rjung
Date: Mon Apr  4 09:40:28 2016
New Revision: 1737646

URL: http://svn.apache.org/viewvc?rev=1737646=rev
Log:
Silence GCC warning about unused label.

Modified:
tomcat/native/trunk/native/src/sslcontext.c

Modified: tomcat/native/trunk/native/src/sslcontext.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1737646=1737645=1737646=diff
==
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Mon Apr  4 09:40:28 2016
@@ -1154,7 +1154,6 @@ TCN_IMPLEMENT_CALL(jboolean, SSLContext,
 rv = JNI_FALSE;
 }
 
-cleanup:
 free(cert);
 return rv;
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 59269] New: Session swapping out in PersistentManagerBase

https://bz.apache.org/bugzilla/show_bug.cgi?id=59269

Bug ID: 59269
Summary: Session swapping out in PersistentManagerBase
Product: Tomcat 9
Version: 9.0.0.M4
Hardware: PC
Status: NEW
Severity: major
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: johny_wal...@centrum.cz

I've been trying to setup PersistentManager, more precisely I wanted to
configure session swapping out to achieve memory friendly configuration under
high load.
To my surprise, this is not possible, or I must be missing something crucial.

Swapping out only works, when the session is idle for too long. However, it
does not work together with the 'maxActiveSessions' configuration option.

Method processMaxActiveSwaps()
--
In the org.apache.catalina.session.PersistentManagerBase, there is method
called processMaxActiveSwaps(), which should do the 'maxActiveSessions'
checking and swap out superfluous sessions. However, the method body never
executes:

Compare the condition "if (getMaxActiveSessions() >= sessions.length) return;"
with the fact, that exception is thrown if too many sessions are created in
org.apache.catalina.session.ManagerBase.createSession().

I've found this bug in versions 7, 8, 9. Seems that this bug is there since
ages, the same already reported here (in 2001!!!):
https://mail-archives.apache.org/mod_mbox/tomcat-dev/200112.mbox/%3c3c20d8ae.d9b77...@distributopia.com%3E
https://mail-archives.apache.org/mod_mbox/tomcat-dev/200112.mbox/<3c20d8ae.d9b77...@distributopia.com>

Expected behaviour
--
Just to eliminate possible misunderstandings, here is what behaviour I expected
from the documentation, the source code and what common sence tells me: there
is configuration option 'maxActiveSessions' which simply limits number of
sessions stored in the memory, to avoid OutOfMemExeption etc. However, I have
session timeout set up for couple of hours (needed) and it is not possible to
keep them all in memory. And I don't even want to tell to my users: Sorry, no
space for you, here you have it: TooManyActiveSessionsException on you. So I'd
like to swap out sessions not active for say half an hour. There is
'minIdleSwap' config option, which tells when the session may be swapped out if
needed. BTW. as this does not work, this option is currently completely
useless.

What can be done: remove the check in
org.apache.catalina.session.ManagerBase.createSession() (or make it less strict
- e.g. allow couple of additional sessions to be created over this limit). Then
the processMaxActiveSwaps() method would do its job nicely and overflowing
sessions would be swapped out.

Many thanks for 1) any clarification if I'm wrong OR 2) bug fixing :-) OR 3)
removing the stale/old/never-more-working source code and documenting that this
feature is simply not there even though it looks like it is.

--
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1737639 - /tomcat/native/trunk/native/srclib/apr/NMAKEmakefile

2016-04-04 Thread kkolinko

Author: kkolinko
Date: Mon Apr  4 08:59:11 2016
New Revision: 1737639

URL: http://svn.apache.org/viewvc?rev=1737639=rev
Log:
Correct typo in a comment - followup to r1733822

Modified:
tomcat/native/trunk/native/srclib/apr/NMAKEmakefile

Modified: tomcat/native/trunk/native/srclib/apr/NMAKEmakefile
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/srclib/apr/NMAKEmakefile?rev=1737639=1737638=1737639=diff
==
--- tomcat/native/trunk/native/srclib/apr/NMAKEmakefile (original)
+++ tomcat/native/trunk/native/srclib/apr/NMAKEmakefile Mon Apr  4 08:59:11 2016
@@ -162,7 +162,7 @@ $(WORKDIR)\gen_test_char.obj: $(SRCDIR)\
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
 
 # Needs additional dynamically generated header file.
-# It is created in $(WORKDIR), so add it to header serach dirs.
+# It is created in $(WORKDIR), so add it to header search dirs.
 {$(SRCDIR)\encoding}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) -I$(WORKDIR) $(PDBFLAGS) $<
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.0.x) failed

2016-04-04 Thread Bill Barker

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.
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: 31 mins 5 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-20160404.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-20160404-native-src.tar.gz
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160404-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-20160404/lib 
-Dexecute.test.nio=false -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160404.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/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output

[Bug 56126] 8.0.1 Regression with Spring with AspectJ Load-Time Weaving

https://bz.apache.org/bugzilla/show_bug.cgi?id=56126

--- Comment #9 from Violeta Georgieva  ---
(In reply to Andrei Ivanov from comment #8)
> Did a quick test on 8.0.33 and I can confirm the regression.
> But I guess we need a new issue for this.

Please do so.

Regards,
Violeta

-- 
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: r1737635 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java java/org/apache/catalina/startup/LocalStrings.properties java/org/apache/catalina/startup/LocalS

Author: violetagg
Date: Mon Apr  4 08:24:24 2016
New Revision: 1737635

URL: http://svn.apache.org/viewvc?rev=1737635=rev
Log:
Merged revision 1737632 from tomcat/trunk:
Clarify in the log message that specifying both urlPatterns and value 
attributes in WebServlet and WebFilter annotations is not allowed.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties

tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr  4 08:24:24 2016
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1726171-1726173,1
 
726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286
 /tomcat/tc8.5.x/trunk:1735579,1736839,1737199

svn commit: r1737634 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java java/org/apache/catalina/startup/LocalStrings.properties java/org/apache/catalina/startup/LocalS

Author: violetagg
Date: Mon Apr  4 08:20:55 2016
New Revision: 1737634

URL: http://svn.apache.org/viewvc?rev=1737634=rev
Log:
Merged revision 1737632 from tomcat/trunk:
Clarify in the log message that specifying both urlPatterns and value 
attributes in WebServlet and WebFilter annotations is not allowed.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties

tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr  4 08:20:55 2016
@@ -1,2 +1,2 @@
 /tomcat/tc8.5.x/trunk:1735042
-/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

svn commit: r1737633 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java java/org/apache/catalina/startup/LocalStrings.properties java/org/apache/catalina/startup/LocalS

Author: violetagg
Date: Mon Apr  4 08:19:18 2016
New Revision: 1737633

URL: http://svn.apache.org/viewvc?rev=1737633=rev
Log:
Merged revision 1737632 from tomcat/trunk:
Clarify in the log message that specifying both urlPatterns and value 
attributes in WebServlet and WebFilter annotations is not allowed.

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/java/org/apache/catalina/startup/LocalStrings.properties

tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr  4 08:19:18 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
+/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

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=1737633=1737632=1737633=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 
Mon Apr  4 08:19:18 2016
@@ -2317,7 +2317,7 @@ public class ContextConfig implements Li
 if ("value".equals(name) || "urlPatterns".equals(name)) {
 if (urlPatternsSet) {
 throw new IllegalArgumentException(sm.getString(
-"contextConfig.urlPatternValue", className));
+"contextConfig.urlPatternValue", "WebServlet", 
className));
 }
 urlPatternsSet = true;
 urlPatterns = processAnnotationsStringArray(evp.getValue());
@@ -2429,7 +2429,7 @@ public class ContextConfig implements Li
 if ("value".equals(name) || "urlPatterns".equals(name)) {
 if (urlPatternsSet) {
 throw new IllegalArgumentException(sm.getString(
-"contextConfig.urlPatternValue", className));
+"contextConfig.urlPatternValue", "WebFilter", 
className));
 }
 urlPatterns = processAnnotationsStringArray(evp.getValue());
 urlPatternsSet = urlPatterns.length > 0;

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1737633=1737632=1737633=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties 
Mon Apr  4 08:19:18 2016
@@ -69,7 +69,7 @@ contextConfig.start=ContextConfig: Proce
 contextConfig.stop=ContextConfig: Processing STOP
 contextConfig.unavailable=Marking this application unavailable due to previous 
error(s)
 contextConfig.unknownUrlProtocol=The URL protocol [{0}] was not recognised 
during annotation processing. URL [{1}] was ignored.
-contextConfig.urlPatternValue=Both the UrlPattern and value attribute were set 
for the WebServlet annotation on class [{0}]
+contextConfig.urlPatternValue=Both the urlPatterns and value attributes were 
set for the {0} annotation on class [{1}]
 contextConfig.webinfClassesUrl=Unable to determine URL for [{0}]
 contextConfig.xmlSettings=Context [{0}] will parse web.xml and 
web-fragment.xml files with validation:{1} and namespaceAware:{2}
 embedded.noEngines=No engines have been defined yet

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties?rev=1737633=1737632=1737633=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
 Mon Apr  4 08:19:18 2016
@@ -56,7 +56,7 @@ contextConfig.start = "ContextConfig"\:

svn commit: r1737632 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java java/org/apache/catalina/startup/LocalStrings.properties java/org/apache/catalina/startup/LocalStrings_es.p

Author: violetagg
Date: Mon Apr  4 08:17:28 2016
New Revision: 1737632

URL: http://svn.apache.org/viewvc?rev=1737632=rev
Log:
Clarify in the log message that specifying both urlPatterns and value 
attributes in WebServlet and WebFilter annotations is not allowed.

Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
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=1737632=1737631=1737632=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Mon Apr  4 
08:17:28 2016
@@ -2317,7 +2317,7 @@ public class ContextConfig implements Li
 if ("value".equals(name) || "urlPatterns".equals(name)) {
 if (urlPatternsSet) {
 throw new IllegalArgumentException(sm.getString(
-"contextConfig.urlPatternValue", className));
+"contextConfig.urlPatternValue", "WebServlet", 
className));
 }
 urlPatternsSet = true;
 urlPatterns = processAnnotationsStringArray(evp.getValue());
@@ -2429,7 +2429,7 @@ public class ContextConfig implements Li
 if ("value".equals(name) || "urlPatterns".equals(name)) {
 if (urlPatternsSet) {
 throw new IllegalArgumentException(sm.getString(
-"contextConfig.urlPatternValue", className));
+"contextConfig.urlPatternValue", "WebFilter", 
className));
 }
 urlPatterns = processAnnotationsStringArray(evp.getValue());
 urlPatternsSet = urlPatterns.length > 0;

Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1737632=1737631=1737632=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Mon 
Apr  4 08:17:28 2016
@@ -69,7 +69,7 @@ contextConfig.start=ContextConfig: Proce
 contextConfig.stop=ContextConfig: Processing STOP
 contextConfig.unavailable=Marking this application unavailable due to previous 
error(s)
 contextConfig.unknownUrlProtocol=The URL protocol [{0}] was not recognised 
during annotation processing. URL [{1}] was ignored.
-contextConfig.urlPatternValue=Both the UrlPattern and value attribute were set 
for the WebServlet annotation on class [{0}]
+contextConfig.urlPatternValue=Both the urlPatterns and value attributes were 
set for the {0} annotation on class [{1}]
 contextConfig.webinfClassesUrl=Unable to determine URL for [{0}]
 contextConfig.xmlSettings=Context [{0}] will parse web.xml and 
web-fragment.xml files with validation:{1} and namespaceAware:{2}
 embedded.noEngines=No engines have been defined yet

Modified: 
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties?rev=1737632=1737631=1737632=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties 
Mon Apr  4 08:17:28 2016
@@ -56,7 +56,7 @@ contextConfig.start = "ContextConfig"\:
 contextConfig.stop = "ContextConfig"\: Procesando "STOP"
 contextConfig.unavailable = Esta aplicaci\u00F3n est\u00E1 marcada como no 
disponible debido a los errores precedentes
 contextConfig.unknownUrlProtocol = El protocolo de URL [{0}] no fue reconocido 
durante el proceso de anotaciones. Se ignor\u00F3 la URL [{1}].
-contextConfig.urlPatternValue = Ambis valores de UrlPattern y atributo fuerno 
puestos para anotaci\u00F3n de WebServlet de la clase [{0}]
+contextConfig.urlPatternValue = Ambis valores de urlPatterns y atributo fuerno 
puestos para anotaci\u00F3n de {0} de la clase [{1}]
 contextConfig.webinfClassesUrl = No pude determinar la URL para WEB-INF/classes
 contextConfig.xmlSettings = El contexto [{0}] analizar\u00E1 los ficheros 
web.xml y web-fragment.xml con validaci\u00F3n\:{1} y namespaceAware\:{2}
 embedded.noEngines = Alg\u00FAn motor (engine) no ha sido a\u00FAn definido

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:

[Bug 56126] 8.0.1 Regression with Spring with AspectJ Load-Time Weaving