date:20181206

[GUMP@vmgump-vm3]: Project tomcat-tc8.5.x (in module tomcat-8.5.x) failed

2018-12-06 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-tc8.5.x has an issue affecting its community integration.
This issue affects 4 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.5.x :  Tomcat 8.x, a web server implementing the Java Servlet 
3.1,
...
- tomcat-tc8.5.x-test-apr :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...
- tomcat-tc8.5.x-test-nio :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...
- tomcat-tc8.5.x-test-nio2 :  Tomcat 8.x, a web server implementing the 
Java Servlet 3.1,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on junit exists, no need to add for property junit.jar.
 -INFO- Made directory [/srv/gump/public/workspace/tomcat-8.5.x/tomcat-deps]
 -INFO- Failed with reason build failed
 -DEBUG- Extracted fallback artifacts from Gump Repository



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x/gump_work/build_tomcat-8.5.x_tomcat-tc8.5.x.html
Work Name: build_tomcat-8.5.x_tomcat-tc8.5.x (Type: Build)
Work ended in a state of : Failed
Elapsed: 15 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 -Dbase.path=/srv/gump/public/workspace/tomcat-8.5.x/tomcat-build-libs 
[Working Directory: /srv/gump/public/workspace/tomcat-8.5.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/classes:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar:/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar:/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-8.5.x/build.xml

download-compile:

testexist:
 [echo] Testing  for 
/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar

downloadgz-2:

testexist:
 [echo] Testing  for 
/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar

downloadfile-2:

build-prepare:
   [delete] Deleting directory 
/srv/gump/public/workspace/tomcat-8.5.x/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-8.5.x/output/build/temp

compile-prepare:

download-validate:

validate:

compile:
[javac] Compiling 1655 source files to 
/srv/gump/public/workspace/tomcat-8.5.x/output/classes
[javac] Support for javac --release has been added in Java9 ignoring it
[javac] 
/srv/gump/public/workspace/tomcat-8.5.x/java/org/apache/tomcat/util/scan/ReferenceCountedJar.java:30:
 error: ReferenceCountedJar is not abstract and does not override abstract 
method entryExists(String) in Jar
[javac] public class ReferenceCountedJar implements Jar {
[javac]^
[javac] Note: Some input files use or override a deprecated API.
[javac] Note: Recompile with -Xlint:deprecation for details.
[javac] 1 error

BUILD FAILED
/srv/gump/public/workspace/tomcat-8.5.x/build.xml:675: Compile failed; see the 
compiler error output for details.

Total time: 15 seconds
-

To subscribe to this information via syndicated feeds:
- RSS: http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x/rss.xml
- Atom: http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 20181206060005, vmgump-vm3.apache.org:vmgump:20181206060005
Gump E-mail Identifier (unique within run) #1.

--
Apache Gump
http://gump.apache.org/ [

svn commit: r1848275 - /tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/ReferenceCountedJar.java

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 09:35:42 2018
New Revision: 1848275

URL: http://svn.apache.org/viewvc?rev=1848275&view=rev
Log:
Add additional method present in 8.5.x

Modified:

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/ReferenceCountedJar.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/ReferenceCountedJar.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/ReferenceCountedJar.java?rev=1848275&r1=1848274&r2=1848275&view=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/ReferenceCountedJar.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/ReferenceCountedJar.java 
Thu Dec  6 09:35:42 2018
@@ -143,4 +143,13 @@ public class ReferenceCountedJar impleme
 jar.wrappedJar.reset();
 }
 }
+
+
+@Override
+@Deprecated
+public boolean entryExists(String name) throws IOException {
+try (ReferenceCountedJar jar = open()) {
+return jar.wrappedJar.entryExists(name);
+}
+}
 }



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

svn commit: r1848276 - /tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 10:01:46 2018
New Revision: 1848276

URL: http://svn.apache.org/viewvc?rev=1848276&view=rev
Log:
Fix copy/paste error

Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1848276&r1=1848275&r2=1848276&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
[UTF-8] Thu Dec  6 10:01:46 2018
@@ -240,7 +240,7 @@ jsp.message.jsp_added=Adding JSP for pat
 jsp.message.jsp_queue_created=Created jsp queue with length [{0}] for context 
[{1}]
 jsp.message.jsp_queue_update=Updating JSP for path [{0}] in queue of context 
[{1}]
 jsp.message.jsp_removed_excess=Removing excess JSP for path [{0}] from queue 
of context [{1}]
-jsp.message.jsp_removed_idle=Removing idle JSP for path [{0}] in context [{1}] 
after [{2}] seconds");
+jsp.message.jsp_removed_idle=Removing idle JSP for path [{0}] in context [{1}] 
after [{2}] seconds
 jsp.message.jsp_unload_check=Checking JSPs for unload in context [{0}], JSP 
count: [{1}] queue length: [{2}]
 jsp.message.parent_class_loader_is=Parent class loader is: [{0}]
 jsp.message.scratch.dir.is=Scratch dir for the JSP engine is: [{0}]



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

svn commit: r1848277 - in /tomcat/trunk/java/org/apache/coyote: LocalStrings.properties LocalStrings_fr.properties

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 10:09:17 2018
New Revision: 1848277

URL: http://svn.apache.org/viewvc?rev=1848277&view=rev
Log:
Remove term that was refactored (and renamed) to AbstractEndpoint

Modified:
tomcat/trunk/java/org/apache/coyote/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/LocalStrings_fr.properties

Modified: tomcat/trunk/java/org/apache/coyote/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/LocalStrings.properties?rev=1848277&r1=1848276&r2=1848277&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/LocalStrings.properties [UTF-8] 
(original)
+++ tomcat/trunk/java/org/apache/coyote/LocalStrings.properties [UTF-8] Thu Dec 
 6 10:09:17 2018
@@ -36,7 +36,6 @@ abstractProtocol.mbeanDeregistrationFail
 
 abstractProtocolHandler.asyncTimeoutError=Error processing async timeouts
 abstractProtocolHandler.destroy=Destroying ProtocolHandler [{0}]
-abstractProtocolHandler.getAttribute=Get attribute [{0}] with value [{1}]
 abstractProtocolHandler.init=Initializing ProtocolHandler [{0}]
 abstractProtocolHandler.pause=Pausing ProtocolHandler [{0}]
 abstractProtocolHandler.portOffset=ProtocolHandler [{0}] is configured with a 
base port of [{1}] and a port offset of [{2}]

Modified: tomcat/trunk/java/org/apache/coyote/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/LocalStrings_fr.properties?rev=1848277&r1=1848276&r2=1848277&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/LocalStrings_fr.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/LocalStrings_fr.properties Thu Dec  6 
10:09:17 2018
@@ -35,7 +35,6 @@ abstractProtocol.mbeanDeregistrationFail
 
 abstractProtocolHandler.asyncTimeoutError=Erreur de traitement du dÃ©lai 
d'attente maximum en mode asynchrone
 abstractProtocolHandler.destroy=Destruction du ProtocolHandler [{0}]
-abstractProtocolHandler.getAttribute=Demande de l''attribut [{0}] avec la 
valeur [{1}]
 abstractProtocolHandler.init=Initialisation du ProtocolHandler [{0}]
 abstractProtocolHandler.pause=Le ProtocolHandler [{0}] est mis en pause
 abstractProtocolHandler.portOffset=Le ProtocolHandler [{0}] est configurÃ© 
avec un port de base [{1}] et un offset de port [{2}]



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

svn commit: r1848279 - in /tomcat/trunk/java/org/apache/tomcat/websocket: LocalStrings.properties LocalStrings_fr.properties

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 10:19:52 2018
New Revision: 1848279

URL: http://svn.apache.org/viewvc?rev=1848279&view=rev
Log:
Remove unused term reported by woonsan

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_fr.properties

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1848279&r1=1848278&r2=1848279&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties 
[UTF-8] Thu Dec  6 10:19:52 2018
@@ -86,7 +86,6 @@ wsRemoteEndpoint.closed=Message will not
 wsRemoteEndpoint.closedDuringMessage=The remainder of the message will not be 
sent because the WebSocket session has been closed
 wsRemoteEndpoint.closedOutputStream=This method may not be called as the 
OutputStream has been closed
 wsRemoteEndpoint.closedWriter=This method may not be called as the Writer has 
been closed
-wsRemoteEndpoint.concurrentMessageSend=Messages may not be sent concurrently 
even when using the asynchronous send messages. The client must wait for the 
previous message to complete before sending the next.
 wsRemoteEndpoint.flushOnCloseFailed=Batched messages still enabled after 
session has been closed. Unable to flush remaining batched message.
 wsRemoteEndpoint.invalidEncoder=The specified encoder of type [{0}] could not 
be instantiated
 wsRemoteEndpoint.noEncoder=No encoder specified for object of class [{0}]

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_fr.properties?rev=1848279&r1=1848278&r2=1848279&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_fr.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_fr.properties 
Thu Dec  6 10:19:52 2018
@@ -82,7 +82,6 @@ wsRemoteEndpoint.closed=Le message ne se
 wsRemoteEndpoint.closedDuringMessage=Le reste du message ne sera pas envoyÃ© 
parce que la session WebSocket est dÃ©jÃ  fermÃ©e.
 wsRemoteEndpoint.closedOutputStream=La mÃ©thode ne peut pas Ãªtre appelÃ©e 
alors que l'OutputStream a Ã©tÃ© fermÃ©e
 wsRemoteEndpoint.closedWriter=Cette mÃ©thode ne doit pas Ãªtre appelÃ©e car le 
Writer a Ã©tÃ© fermÃ©
-wsRemoteEndpoint.concurrentMessageSend=Les messages ne peuvent pas Ãªtre 
envoyÃ©s de maniÃ¨re concurrente mÃªme en utilisant des envois de messages 
asynchrones, le client doit attendre que le message prÃ©cÃ©dent soit envoyÃ©
 wsRemoteEndpoint.flushOnCloseFailed=Le groupement de messages est toujours 
actif aprÃ¨s fermeture de la session, impossible d'envoyer les messages restants
 wsRemoteEndpoint.invalidEncoder=L''encodeur spÃ©cifiÃ© de type [{0}] n''a pu 
Ãªtre instanciÃ©
 wsRemoteEndpoint.noEncoder=Pas d''encodeur spÃ©cifiÃ© pour un objet de classe 
[{0}]



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

svn commit: r1848282 - /tomcat/trunk/java/org/apache/catalina/storeconfig/

2018-12-06 Thread remm

Author: remm
Date: Thu Dec  6 10:51:04 2018
New Revision: 1848282

URL: http://svn.apache.org/viewvc?rev=1848282&view=rev
Log:
Add i18n for the storeconfig package. Also filter out tomcat-web.xml that has 
been added.

Modified:

tomcat/trunk/java/org/apache/catalina/storeconfig/GlobalNamingResourcesSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/storeconfig/NamingResourcesSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFileMover.java
tomcat/trunk/java/org/apache/catalina/storeconfig/WatchedResourceSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/WrapperLifecycleSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/WrapperListenerSF.java

Modified: 
tomcat/trunk/java/org/apache/catalina/storeconfig/GlobalNamingResourcesSF.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/GlobalNamingResourcesSF.java?rev=1848282&r1=1848281&r2=1848282&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/storeconfig/GlobalNamingResourcesSF.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/storeconfig/GlobalNamingResourcesSF.java 
Thu Dec  6 10:51:04 2018
@@ -55,21 +55,16 @@ public class GlobalNamingResourcesSF ext
 resourcesdesc.getStoreFactory().store(aWriter, indent + 2,
 resources);
 } else {
-if(log.isWarnEnabled())
-log.warn("Can't find NamingResources Store Factory!");
+
log.warn(sm.getString("globalNamingResourcesSF.noFactory"));
 }
 
 getStoreAppender().printIndent(aWriter, indent + 2);
 getStoreAppender().printCloseTag(aWriter, elementDesc);
 } else {
-if (log.isWarnEnabled())
-log.warn("Descriptor for element" + aElement.getClass()
-+ " not configured!");
+log.warn(sm.getString("storeFactory.noDescriptor", 
aElement.getClass(), "GlobalNamingResources"));
 }
 } else {
-if (log.isWarnEnabled())
-log.warn("wrong element " + aElement.getClass());
-
+log.warn(sm.getString("globalNamingResourcesSF.wrongElement", 
aElement.getClass()));
 }
 }
 }

Modified: 
tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties?rev=1848282&r1=1848281&r2=1848282&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties 
[UTF-8] Thu Dec  6 10:51:04 2018
@@ -22,8 +22,22 @@ config.storeServerError=Error storing se
 factory.storeNoDescriptor=Descriptor for element class [{0}] not configured!
 factory.storeTag=store tag [{0}] ( Object: [{1}] )
 
+globalNamingResourcesSF.noFactory=Cannot find NamingResources store factory
+globalNamingResourcesSF.wrongElement=Wrong element [{0}]
+
 registry.loadClassFailed=Failed to load class [{0}]
 
+standardContextSF.canonicalPathError=Failed to obtain the canonical path of 
the configuration file [{0}]
+standardContextSF.cannotWriteFile=Cannot write file at [{0}]
+standardContextSF.moveFailed=Context original file at [{0}] is null, not a 
file or not writable
+standardContextSF.storeContext=Store context [{0}] configuration separately at 
path [{1}]
+standardContextSF.storeContextWithBackup=Store context [{0}] configuration 
separately with backup at path [{1}]
+
 storeConfigListener.loadError=Error loading StoreConfig
 storeConfigListener.notServer=The listener was added to component other than 
the Server and will therefore be ignored
 storeConfigListener.registerError=Error registering StoreConfig MBean
+
+storeFactory.noDescriptor=Descriptor for element [{0}].[{1}] not configured
+
+storeFileMover.directoryCreationError=Cannot create directory [{0}]
+storeFileMover.renameError=Cannot rename [{0}] to [{1}]

Modified: 
tomcat/trunk/java/org/apache/catalina/storeconfig/NamingResourcesSF.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/NamingResourcesSF.java?rev=1848282&r1=1848281&r2=1848282&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/storeconfig/NamingResourcesSF.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/NamingResourcesSF.java 
Thu Dec  6 10:51:04 2018
@@ -50,9 +50,7 @@ public class NamingResourcesSF extends S
 + " )");
 storeChi

open visibility of JavaClassCacheEntry

2018-12-06 Thread Romain Manni-Bucau

Hi guys,

can you make ContextConfig.JavaClassCacheEntry public please? Idea is to be
able to override ContextConfig and potentially customize processAnnotations
methods. Currently it is a pain and it is preventing to upgrade meecrowave
and likely tomee to java11+jlink support

Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | Book

svn commit: r1848284 - /tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 11:14:41 2018
New Revision: 1848284

URL: http://svn.apache.org/viewvc?rev=1848284&view=rev
Log:
Remove unused import

Modified:
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java

Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1848284&r1=1848283&r2=1848284&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Thu Dec  6 
11:14:41 2018
@@ -46,7 +46,6 @@ import org.apache.catalina.Service;
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
-import org.apache.catalina.realm.RealmBase.AllRolesMode;
 import org.apache.catalina.util.LifecycleMBeanBase;
 import org.apache.catalina.util.SessionConfig;
 import org.apache.catalina.util.ToStringUtil;



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

svn commit: r1848289 - /tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 11:30:18 2018
New Revision: 1848289

URL: http://svn.apache.org/viewvc?rev=1848289&view=rev
Log:
Make meaning of messages clearer

Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties?rev=1848289&r1=1848288&r2=1848289&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties 
[UTF-8] Thu Dec  6 11:30:18 2018
@@ -24,8 +24,8 @@ deltaManager.createMessage.access=Manage
 deltaManager.createMessage.accessChangePrimary=Manager [{0}]: create session 
message [{1}] access to change primary.
 deltaManager.createMessage.allSessionData=Manager [{0}] sent all session data.
 deltaManager.createMessage.allSessionTransfered=Manager [{0}] sent all session 
data transferred
-deltaManager.createMessage.delta=Manager [{0}]: create session message [{1}] 
delta request.
-deltaManager.createMessage.expire=Manager [{0}]: create session message [{1}] 
expire.
+deltaManager.createMessage.delta=Manager [{0}]: create delta request message 
for session [{1}]
+deltaManager.createMessage.expire=Manager [{0}]: create session expire message 
for session [{1}]
 deltaManager.createMessage.unableCreateDeltaRequest=Unable to serialize delta 
request for sessionid [{0}]
 deltaManager.createSession.newSession=Created a DeltaSession with Id [{0}] 
Total count=[{1}]
 deltaManager.dropMessage=Manager [{0}]: Drop message [{1}] inside 
GET_ALL_SESSIONS sync phase start date [{2}] message date [{3}]



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

svn commit: r1848290 - /tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 11:33:13 2018
New Revision: 1848290

URL: http://svn.apache.org/viewvc?rev=1848290&view=rev
Log:
Make meaning of messages clearer

Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties?rev=1848290&r1=1848289&r2=1848290&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties 
[UTF-8] Thu Dec  6 11:33:13 2018
@@ -20,14 +20,14 @@ backupManager.stopped=Manager [{0}] is s
 
 clusterSessionListener.noManager=Context manager doesn''t exist:[{0}]
 
-deltaManager.createMessage.access=Manager [{0}]: create session message [{1}] 
access.
-deltaManager.createMessage.accessChangePrimary=Manager [{0}]: create session 
message [{1}] access to change primary.
+deltaManager.createMessage.access=Manager [{0}]: create session access message 
for session [{1}]
+deltaManager.createMessage.accessChangePrimary=Manager [{0}]: create change 
primary node message for session [{1}]
 deltaManager.createMessage.allSessionData=Manager [{0}] sent all session data.
 deltaManager.createMessage.allSessionTransfered=Manager [{0}] sent all session 
data transferred
 deltaManager.createMessage.delta=Manager [{0}]: create delta request message 
for session [{1}]
 deltaManager.createMessage.expire=Manager [{0}]: create session expire message 
for session [{1}]
 deltaManager.createMessage.unableCreateDeltaRequest=Unable to serialize delta 
request for sessionid [{0}]
-deltaManager.createSession.newSession=Created a DeltaSession with Id [{0}] 
Total count=[{1}]
+deltaManager.createSession.newSession=Created a new DeltaSession with Id [{0}] 
Total count=[{1}]
 deltaManager.dropMessage=Manager [{0}]: Drop message [{1}] inside 
GET_ALL_SESSIONS sync phase start date [{2}] message date [{3}]
 deltaManager.expireSessions=Manager [{0}] expiring sessions upon shutdown
 deltaManager.foundMasterMember=Found for context [{0}] the replication master 
member [{1}]



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

svn commit: r1848291 - /tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 11:38:55 2018
New Revision: 1848291

URL: http://svn.apache.org/viewvc?rev=1848291&view=rev
Log:
Remove unused term

Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1848291&r1=1848290&r2=1848291&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
[UTF-8] Thu Dec  6 11:38:55 2018
@@ -114,7 +114,6 @@ jsp.error.mandatory.attribute=[{0}]: Man
 jsp.error.missing.tagInfo=TagInfo object for [{0}] is missing from TLD
 jsp.error.missing_attribute=According to the TLD or the tag file, attribute 
[{0}] is mandatory for tag [{1}]
 jsp.error.missing_var_or_varReader=Missing 'var' or 'varReader' attribute
-jsp.error.multiple.jsp=Cannot have multiple specifications of
 jsp.error.namedAttribute.invalidUse=jsp:attribute must be the subelement of a 
standard or custom action
 jsp.error.needAlternateJavaEncoding=Default java encoding [{0}] is invalid on 
your java platform. An alternate can be specified via the ''javaEncoding'' 
parameter of JspServlet.
 jsp.error.nested.jspattribute=A jsp:attribute standard action cannot be nested 
within another jsp:attribute standard action



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

svn commit: r1848293 - /tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 11:44:11 2018
New Revision: 1848293

URL: http://svn.apache.org/viewvc?rev=1848293&view=rev
Log:
Add missing verb reported by woonsan

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties?rev=1848293&r1=1848292&r2=1848293&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties
 [UTF-8] (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties
 [UTF-8] Thu Dec  6 11:44:11 2018
@@ -35,7 +35,7 @@ nioSender.datagram.already.established=D
 nioSender.key.inValid=Key is not valid, it must have been cancelled.
 nioSender.not.connected=NioSender is not connected, this should not occur.
 nioSender.receive.failedAck=Received a failed 
ack:org.apache.catalina.tribes.transport.Constants.FAIL_ACK_DATA
-nioSender.sender.disconnected=Sender has been disconnected, can't selection 
key.
+nioSender.sender.disconnected=Sender has been disconnected, can't process 
selection key.
 nioSender.socketChannel.already.established=Socket channel has already been 
established. Connection might be in progress.
 nioSender.unable.disconnect=Unable to disconnect NioSender. msg=[{0}]
 nioSender.unable.receive.ack=Unable to receive an ack message. EOF on socket 
channel has been reached.



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

svn commit: r1848294 - /tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 11:48:51 2018
New Revision: 1848294

URL: http://svn.apache.org/viewvc?rev=1848294&view=rev
Log:
Better labels

Modified:
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties

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=1848294&r1=1848293&r2=1848294&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties 
[UTF-8] Thu Dec  6 11:48:51 2018
@@ -174,8 +174,8 @@ versionLoggerListener.os.name=OS Name:
 versionLoggerListener.os.version=OS Version:{0}
 versionLoggerListener.prop=System property:   {0} = {1}
 versionLoggerListener.serverInfo.server.built=Server built:  {0}
-versionLoggerListener.serverInfo.server.number=Server number: {0}
-versionLoggerListener.serverInfo.server.version=Server version:{0}
+versionLoggerListener.serverInfo.server.number=Server version number: {0}
+versionLoggerListener.serverInfo.server.version=Server version name:   {0}
 versionLoggerListener.vm.vendor=JVM Vendor:{0}
 versionLoggerListener.vm.version=JVM Version:   {0}
 



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

Re: open visibility of JavaClassCacheEntry

2018-12-06 Thread Romain Manni-Bucau

PS: alternative which can be saner would be to split webConfig() in a set
of small protected methods instead of a monolitic block, typically here a
processAnnotations(webXmls) not depending on internals can work

Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | Book



Le jeu. 6 déc. 2018 à 11:51, Romain Manni-Bucau  a
écrit :

> Hi guys,
>
> can you make ContextConfig.JavaClassCacheEntry public please? Idea is to
> be able to override ContextConfig and potentially customize
> processAnnotations methods. Currently it is a pain and it is preventing to
> upgrade meecrowave and likely tomee to java11+jlink support
>
> Romain Manni-Bucau
> @rmannibucau  |  Blog
>  | Old Blog
>  | Github
>  | LinkedIn
>  | Book
> 
>

buildbot failure in on tomcat-trunk

2018-12-06 Thread buildbot

The Buildbot has detected a new failure on builder tomcat-trunk while building 
. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/3844

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1848290
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

buildbot success in on tomcat-trunk

2018-12-06 Thread buildbot

The Buildbot has detected a restored build on builder tomcat-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/3845

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1848294
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1848303 - in /tomcat/trunk/java/org/apache: catalina/core/LocalStrings_de.properties catalina/core/LocalStrings_fr.properties catalina/webresources/LocalStrings_fr.properties jasper/resou

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 13:07:33 2018
New Revision: 1848303

URL: http://svn.apache.org/viewvc?rev=1848303&view=rev
Log:
Correctly escape single quotes with a second single quote when {n} sequences 
appear in the message

Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties

tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_de.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_de.properties?rev=1848303&r1=1848302&r2=1848303&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_de.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_de.properties Thu 
Dec  6 13:07:33 2018
@@ -30,7 +30,7 @@ filterChain.filter=WÃ¤hrend der Filter
 naming.wsdlFailed=Die WSDL Datei [{0}] wurde nicht gefunden.
 
 standardContext.listenerStart=Fehler beim Senden der ''Context Initialized'' 
Benachrichtigung an den Listener aus der Klasse [{0}]
-standardContext.loginConfig.errorWarning=WARNING: Form Fehler Seite [{0}] muss 
bei Servlet 2.4 mit einem ''/' starten
+standardContext.loginConfig.errorWarning=WARNING: Form Fehler Seite [{0}] muss 
bei Servlet 2.4 mit einem ''/'' starten
 standardContext.notStarted=Context mit Name [{0}] wurde noch nicht gestartet
 standardContext.securityConstraint.mixHttpMethod= und 
 dÃ¼rfen nicht in derselben Web-Ressource-Kollektion 
verwendet werden
 standardContext.securityConstraint.pattern=UngÃ¼ltiges  [{0}] im 
Security Constraint

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties?rev=1848303&r1=1848302&r2=1848303&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties 
[UTF-8] Thu Dec  6 13:07:33 2018
@@ -176,7 +176,7 @@ standardContext.notStarted=Le contexte [
 standardContext.notWrapper=Le fils du contexte (child of context) doit être un 
enrobeur (wrapper)
 standardContext.parameter.duplicate=Paramètre d''initialisation de contexte 
dupliqué [{0}]
 standardContext.parameter.required=Le nom de paramètre ainsi que la valeur du 
paramètre sont requis
-standardContext.pathInvalid=Un chemin de contexte doit être soit une chaîne 
vide soit commencer par un ''/' et ne pas finir par un ''/', le chemin [{0}] ne 
répond pas à ces conditions et a été changé en [{1}]
+standardContext.pathInvalid=Un chemin de contexte doit être soit une chaîne 
vide soit commencer par un ''/'' et ne pas finir par un ''/'', le chemin [{0}] 
ne répond pas à ces conditions et a été changé en [{1}]
 standardContext.postconstruct.duplicate=La méthode post construct est définie 
en double dans la classe [{0}]
 standardContext.postconstruct.required=A la fois le nom complet qualifié et le 
nom de la méthode sont requis
 standardContext.predestroy.duplicate=Définition dupliquée de la méthode de 
destruction "pre" pour la classe [{0}]

Modified: 
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_fr.properties?rev=1848303&r1=1848302&r2=1848303&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_fr.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_fr.properties 
Thu Dec  6 13:07:33 2018
@@ -44,7 +44,7 @@ fileResourceSet.notFile=Le fichier spÃ�
 jarResource.getInputStreamFail=Impossible d''obtenir une InputStream pour la 
ressource [{0}] situÃ©e dans le JAR [{1}]
 jarResource.getUrlFail=Impossible de dÃ©terminer une URL pour la ressource 
[{0}] dans le JAR [{1}]
 
-jarResourceRoot.invalidWebAppPath=Cette ressource se rÃ©fÃ¨re toujours Ã  un 
rÃ©pertoire donc le webAppPath fourni doit se terminer avec ''/' mais il Ã©tait 
[{0}]
+jarResourceRoot.invalidWebAppPath=Cette ressource se rÃ©fÃ¨re toujours Ã  un 
rÃ©pertoire donc le webAppPath fourni doit se terminer avec ''/'' mais il 
Ã©tait [{0}]
 
 standardRoot.checkStateNotStarted=Les resources ne peuvent pas Ãªtre 
accÃ©dÃ©es tant qu'elles ne sont pas dÃ©marrÃ©es
 standardRoot.createInvalidFile=Impossible de crÃ©er WebResourceSet Ã  partir 
de [{0}]

Modified: 
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.pr

svn commit: r1848304 - in /tomcat/trunk/java/org/apache: catalina/core/ catalina/manager/ catalina/manager/host/ catalina/mapper/ catalina/session/ catalina/startup/ catalina/storeconfig/ catalina/web

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 13:10:06 2018
New Revision: 1848304

URL: http://svn.apache.org/viewvc?rev=1848304&view=rev
Log:
Sync French translations with POEditor

Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties

tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings_fr.properties

tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/coyote/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings_fr.properties

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties?rev=1848304&r1=1848303&r2=1848304&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties 
[UTF-8] Thu Dec  6 13:10:06 2018
@@ -17,7 +17,7 @@ applicationContext.addFilter.ise=Des fil
 applicationContext.addJspFile.iae=Le fichier JSP [{0}] est invalide
 applicationContext.addListener.iae.cnfe=Incapable de créer une instance de 
type [{0}]
 applicationContext.addListener.iae.init=Impossible d''ajouter une instance du 
type [{0}] comme écouteur
-applicationContext.addListener.iae.sclNotAllowed=Il est impossible d'ajouter 
un ServletContextListener dès qu'un a été appelé
+applicationContext.addListener.iae.sclNotAllowed=Il est impossible d'ajouter 
un ServletContextListener après qu'un ait été appelé
 applicationContext.addListener.iae.wrongType=Le type spécifié [{0}] n''est pas 
un type attendu de "listener"
 applicationContext.addListener.ise=Des Listener ne peuvent plus être ajoutés 
au contexte [{0}] car il a déjà été initialisé
 applicationContext.addRole.ise=Vous ne pouvez pas ajouter de rôles au contexte 
[{0}], parce qu''il a déjà été initialisé
@@ -60,7 +60,6 @@ applicationFilterRegistration.nullInitPa
 
 applicationPushBuilder.methodInvalid=La méthode HTTP pour une requête push 
doit être à la fois être sans danger et pouvoir être mise en cache, mais [{0}] 
ne correspond pas
 applicationPushBuilder.methodNotToken=Les méthodes HTTP doivent être des 
"token", mais [{0}] contient un caractère invalide dans un token.
-applicationPushBuilder.noCoyoteRequest=Impossible de trouver l''objet de 
requête Coyote sous-jacent (nécessaire pour la création d''une requête "push") 
depuis la requête de type [{0}]
 
 applicationServletRegistration.setServletSecurity.iae=Contrainte nulle 
spécifiée pour le Servlet [{0}] déployé dans le contexte avec le nom [{1}]
 applicationServletRegistration.setServletSecurity.ise=Les contraintes de 
sécurité ne peuvent pas être ajoutées au Servlet [{0}] déployé dans le contexte 
[{1}] car le contexte a déjà été initialisé
@@ -90,8 +89,13 @@ aprListener.tooLateForSSLEngine=Impossib
 aprListener.tooLateForSSLRandomSeed=setSSLRandomSeed impossible: SSL a déjà 
été initialisé
 aprListener.wrongFIPSMode=Valuer inattendue de l''option FIPSMode de 
AprLifecycleListener: [{0}]
 
+asyncContextImpl.asyncDispachError=Erreur lors d'un dispatch asynchrone
 asyncContextImpl.dispatchingStarted=Une opération de dispatch asynchrone a 
déjà été appelée, plusieurs dispatch au cours d'un même cycle asynchrone n'est 
pas autorisé
 asyncContextImpl.noAsyncDispatcher=Le Servlet dispatcher retourné par le 
ServletContext ne supporte pas de dispatch asynchrone
+asyncContextImpl.onCompleteError=L''appel à onComplete() a échoué pour 
l''écouteur de type [{0}]
+asyncContextImpl.onErrorError=L''appel à onError() a échoué pour l''écouteur 
de type [{0}]
+asyncContextImpl.onStartAsyncError=L''appel à onStartAsync() a échoué pour 
l''écouteur de type [{0}]
+asyncContextImpl.onTimeoutError=L''appel à onTimeout() a échoué pour 
l''écouteur de type [{0}]
 asyncContextImpl.request.ise=Il est illégal d'appeler getRequest() après que 
complete() ou une autre des méthodes dispatch() ait été appelé
 asyncContextImpl.requestEnded=La requête associée avec l'AsyncContext est déjà 
terminée
 asyncContextImpl.response.ise=Il est illégal d'appeler getResponse() après que 
complete() ou n'importe laquelle des méthodes de dispatch a été appelée
@@ -105,7 +109,18 @@ containerBase.nullName=Le

svn commit: r1848305 - in /tomcat/trunk/java/org/apache: catalina/core/ catalina/mapper/ catalina/session/ catalina/startup/ jasper/resources/ naming/factory/ tomcat/util/http/

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 13:12:12 2018
New Revision: 1848305

URL: http://svn.apache.org/viewvc?rev=1848305&view=rev
Log:
Sync Spanish translations with POEditor

Added:
tomcat/trunk/java/org/apache/naming/factory/LocalStrings_es.properties   
(with props)
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_es.properties   
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1848305&r1=1848304&r2=1848305&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties 
[UTF-8] Thu Dec  6 13:12:12 2018
@@ -48,8 +48,6 @@ applicationFilterConfig.jmxUnregisterFai
 applicationFilterRegistration.nullInitParam=No puedo poner el parámetro de 
inicialización para el filtro debido a un nombre nulo y/o valor. Nombre [{0}], 
Valor [{1}]
 applicationFilterRegistration.nullInitParams=No puedo poner los parámetros de 
inicialización para el filtro debido a un nombre nulo y/o valor. Nombre [{0}], 
Valor [{1}]
 
-applicationPushBuilder.noCoyoteRequest=Imposible encontrar la petición de 
objeto original de Coyote (La cual es requerida para crear una solicitud tipo 
push) de la solicitud de tipo  [{0}]
-
 applicationServletRegistration.setServletSecurity.iae=Se ha especificado 
restricción Null para el servlet [{0}] desplegado en el contexto con el nombre 
[{1}]
 applicationServletRegistration.setServletSecurity.ise=No se pueden añadir 
restricciones de seguridad al servlet [{0}] desplegado en el contexto con el 
nombre [{1}] ya que el contexto ya ha sido inicializado.
 

Modified: 
tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_es.properties?rev=1848305&r1=1848304&r2=1848305&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_es.properties Thu 
Dec  6 13:12:12 2018
@@ -16,5 +16,6 @@
 mapper.addHostAlias.success=Alias [{0}] registrado para el servidor [{1}]
 
 mapperListener.registerHost=Registrar mÃ¡quina [{0}] en dominio [{1}] para el 
conector [{2}]
+mapperListener.registerWrapper=Registre la envoltura [{0}] en el contexto 
[{1}] para el servicio [{2}]
 mapperListener.unknownDefaultHost=MÃ¡quina por defecto desconocida: [{0}] para 
el conector [{1}]
 mapperListener.unregisterHost=Desregistrar mÃ¡quina [{0}] en dominio [{1}] 
para el conector [{2}]

Modified: 
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties?rev=1848305&r1=1848304&r2=1848305&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties 
[UTF-8] Thu Dec  6 13:12:12 2018
@@ -20,6 +20,7 @@ JDBCStore.checkConnectionDBReOpenFail=Fa
 JDBCStore.checkConnectionSQLException=Ha tenido lugar una excepción SQL [{0}]
 JDBCStore.close=Excepción cerrando conexión a base de datos [{0}]
 JDBCStore.loading=Cargando Sesión [{0}] desde base de datos [{1}]
+JDBCStore.missingDataSourceName=No se proporcionó un nombre JNDI válido
 JDBCStore.removing=Quitando Sesión [{0}] en base de datos [{1}]
 JDBCStore.saving=Salvando Sesión [{0}] en base de datos [{1}]
 

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=1848305&r1=1848304&r2=1848305&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties 
[UTF-8] Thu Dec  6 13:12:12 2018
@@ -45,8 +45,6 @@ contextConfig.inputStreamJar=No puedo pr
 contextConfig.inputStreamJndi=No puedo procesar el elemento de recurso [{0}] 
para las anotaciones
 contextConfig.invalidSci=No se pudo crear el ServletContentInitializer [{0}]
 contextC

Re: open visibility of JavaClassCacheEntry

2018-12-06 Thread Rémy Maucherat

On Thu, Dec 6, 2018 at 11:51 AM Romain Manni-Bucau 
wrote:

> Hi guys,
>
> can you make ContextConfig.JavaClassCacheEntry public please? Idea is to be
> able to override ContextConfig and potentially customize processAnnotations
> methods. Currently it is a pain and it is preventing to upgrade meecrowave
> and likely tomee to java11+jlink support
>

Ok, so I had a look at the meecrowave main class after doing my embedded
refactoring and I was a bit horrified by the amount of hacks :) Not that
there were too many options to do the things that were done (some I didn't
think were possible), and luckily my changes would have been a very good
help there.

So here, it looks like a bit scary as well, since JavaClassCacheEntry is
package private (not ok usually), but only instantiated from a private
method (what would you do about that ?). So I'd rather not do that, or not
just that, since it would be good to reduce the amount of hacks.

For starters, I don't like "private" in that kind of class (same with
"final"), I prefer "protected" usually. Shouldn't JavaClassCacheEntry be a
non static protected class ?

About webConfig, I'm not sure. A good way to do it would be to add calls to
a few intermediate empty methods in appropriate locations, rather than a
real refactoring.

Rémy

svn commit: r1848306 [1/2] - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/ap

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 13:17:51 2018
New Revision: 1848306

URL: http://svn.apache.org/viewvc?rev=1848306&view=rev
Log:
Sync Japanese translations with POEditor

Added:

tomcat/trunk/java/org/apache/catalina/ha/authenticator/LocalStrings_ja.properties
   (with props)
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_ja.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_ja.properties   
(with props)

tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings_ja.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/tribes/jmx/LocalStrings_ja.properties 
  (with props)

tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings_ja.properties
   (with props)

tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_ja.properties   
(with props)
tomcat/trunk/java/org/apache/naming/factory/LocalStrings_ja.properties   
(with props)
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings_ja.properties   
(with props)
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_ja.properties   
(with props)

tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings_ja.properties   
(with props)
Modified:
tomcat/trunk/java/javax/el/LocalStrings_ja.properties
tomcat/trunk/java/javax/servlet/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/security/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/tribes/group/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/tribes/util/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/users/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/util/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/coyote/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/tomcat/util/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_ja.properties
tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_ja.properties

Modified: tomcat/trunk/java/javax/el/Local

Re: open visibility of JavaClassCacheEntry

2018-12-06 Thread Romain Manni-Bucau

Hello Rémy,


Le jeu. 6 déc. 2018 à 14:13, Rémy Maucherat  a écrit :

> On Thu, Dec 6, 2018 at 11:51 AM Romain Manni-Bucau 
> wrote:
>
> > Hi guys,
> >
> > can you make ContextConfig.JavaClassCacheEntry public please? Idea is to
> be
> > able to override ContextConfig and potentially customize
> processAnnotations
> > methods. Currently it is a pain and it is preventing to upgrade
> meecrowave
> > and likely tomee to java11+jlink support
> >
>
> Ok, so I had a look at the meecrowave main class after doing my embedded
> refactoring and I was a bit horrified by the amount of hacks :) Not that
> there were too many options to do the things that were done (some I didn't
> think were possible), and luckily my changes would have been a very good
> help there.
>
> So here, it looks like a bit scary as well, since JavaClassCacheEntry is
> package private (not ok usually), but only instantiated from a private
> method (what would you do about that ?). So I'd rather not do that, or not
> just that, since it would be good to reduce the amount of hacks.
>
> For starters, I don't like "private" in that kind of class (same with
> "final"), I prefer "protected" usually. Shouldn't JavaClassCacheEntry be a
> non static protected class ?
>
> About webConfig, I'm not sure. A good way to do it would be to add calls to
> a few intermediate empty methods in appropriate locations, rather than a
> real refactoring.
>

not empty cause here the idea is to reuse an existing scanning and not let
tomcat scan classes but yes a doScanMagic() would work
the part which would be great to reuse is the mapping between bytecode (the
annotation entry) and the tomcat model (FilterDef etc)


>
> Rémy
>

svn commit: r1848307 [1/3] - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/o

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 13:20:22 2018
New Revision: 1848307

URL: http://svn.apache.org/viewvc?rev=1848307&view=rev
Log:
Sync Korean translations with POEditor

Added:
tomcat/trunk/java/javax/servlet/http/LocalStrings_ko.properties   (with 
props)
tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings_ko.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/tribes/jmx/LocalStrings_ko.properties 
  (with props)

tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalStrings_ko.properties  
 (with props)

tomcat/trunk/java/org/apache/tomcat/util/digester/LocalStrings_ko.properties   
(with props)
Modified:
tomcat/trunk/java/javax/el/LocalStrings_ko.properties
tomcat/trunk/java/javax/servlet/LocalStrings_ko.properties

tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_ko.properties

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ko.properties

tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_ko.properties

tomcat/trunk/java/org/apache/catalina/tribes/group/LocalStrings_ko.properties

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings_ko.properties

tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_ko.properties

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ko.properties

tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties

tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_ko.properties

tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings_ko.properties

tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/catalina/tribes/util/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/catalina/users/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/catalina/util/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ko.properties

tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/coyote/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_ko.properties

tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_ko.properties

tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/naming/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/naming/factory/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/tomcat/util/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties

tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_ko.properties

tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_ko.properties

tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings_ko.properties

tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_ko.propert

svn commit: r1848307 [3/3] - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/o

2018-12-06 Thread markt

Modified: 
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ko.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ko.properties?rev=1848307&r1=1848306&r2=1848307&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ko.properties 
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ko.properties 
Thu Dec  6 13:20:22 2018
@@ -15,44 +15,135 @@
 
 jasper.error.emptybodycontent.nonempty=TLD íì¼ì ë°ë¥´ë©´, [{0}] 
íê·¸ë ë°ëì ë¹ì´ ìì´ì¼ íëë°, ê·¸ë ì§ ììµëë¤,
 
+jsp.error.action.isnottagfile=[{0}] actionì ì¤ì§ íê·¸ íì¼ë¤ 
ë´ììë§ ì¬ì©ë  ì ììµëë¤.
+jsp.error.action.istagfile=[{0}] ì¡ìì íê·¸ íì¼ ë´ìì ì¬ì©ë  
ì ììµëë¤.
 jsp.error.attribute.deferredmix=${} ì #{} ëª¨ëë¥¼ ëì¼í attributeì 
ê°ì ííìì¼ë¡ ì¬ì©í  ì ììµëë¤.
+jsp.error.attribute.duplicate=íëì ìë¦¬ë¨¼í¸ ë´ìì attributeì 
qualified nameë¤ì ë°ëì ê³ ì í´ì¼ í©ëë¤.
 jsp.error.attribute.noequal=ë±í¸("=")ê° ìêµ¬ë©ëë¤.
 jsp.error.attribute.nowhitespace=JSP ì¤íì ë°ë¥´ë©´, attribute ì´ë¦ì´ 
ë°ëì whitespace ë¤ìì ì¡´ì¬íì¬ì¼ë§ í©ëë¤.
+jsp.error.beans.property.conversion=ìì± [{2}]ì ì¤ì ë ë¬¸ìì´ 
[{0}]ì(ë¥¼) í´ëì¤ [{1}](ì¼)ë¡ ë³íí  ì ììµëë¤: [{3}]
+jsp.error.beans.propertyeditor.notregistered=PropertyEditorê° 
PropertyEditorManagerì í¨ê» ë±ë¡ëì§ ìììµëë¤.
+jsp.error.compiler=ê°ì©í ìë° ì»´íì¼ë¬ê° ììµëë¤.
+jsp.error.config_pagedir_encoding_mismatch=jsp-property-group [{0}]ì ëª
ìë íì´ì§ ì¸ì½ë©ì´ íì´ì§ ëë í°ë¸ [{1}]ì ëªìë ê²ê³¼ 
ë¤ë¦ëë¤.
 jsp.error.data.file.processing=íì¼ [{0}]ì(ë¥¼) ì²ë¦¬íë ê³¼ì ìì 
ì¤ë¥ê° ë°ìíììµëë¤.
+jsp.error.deferredvaluetypewithoutdeferredvalue=ë§ì¼ 'deferredValue' ê°ì´ 
'true'ê° ìëë¼ë©´ ê°ì íìì ëªìí  ì ììµëë¤.
+jsp.error.duplicate.name.jspattribute=íì¤ ëë ì»¤ì¤í ì¡ìì ëª
ìë ìì± [{0}]ì´(ê°) ë´ë¶ì í¬í¨ë jsp:attribute ë´ì name 
ìì±ì ê°ì¼ë¡ë ì¤ì ëì´ ììµëë¤.
 jsp.error.el.template.deferred=#{...}ì(ë) ííë¦¿ íì¤í¸ìì 
íì©ëì§ ììµëë¤.
+jsp.error.el_interpreter_class.instantiation=ELInterpreter í´ëì¤ 
[{0}]ì(ë¥¼) ë¡ëíê±°ë ì¸ì¤í´ì¤ ìì±ì ì¤í¨íìµëë¤.
 jsp.error.fallback.invalidUse=jsp:fallback ì jsp:pluginì ì§ê³ ìì 
ìë¦¬ë¨¼í¸ì´ì´ì¼ í©ëë¤.
+jsp.error.file.not.found=íì¼ [{0}]ì´(ê°) ë°ê²¬ëì§ ììµëë¤.
 jsp.error.file.not.registered=íì¼ [{0}]ì´(ê°) ë°ê²¬ëì§ ììµëë¤.
+jsp.error.include.exception=[{0}]ì(ë¥¼) includeí  ì ììµëë¤.
+jsp.error.internal.filenotfound=ë´ë¶ ì¤ë¥: íì¼ [{0}]ì(ë¥¼) ì°¾ì ì 
ììµëë¤.
+jsp.error.invalid.attribute=[{0}]ì(ë) ì í¨íì§ ìì ìì±ì 
ê°ì§ê³  ììµëë¤: [{1}]
 jsp.error.invalid.tagdir=íê·¸ íì¼ ëë í ë¦¬ [{0}]ì´(ê°) 
"/WEB-INF/tags"ë¡ ììíì§ ììµëë¤.
 jsp.error.invalid.version=[{0}]ì ìë tag íì¼ì´ ì í¨íì§ ìì 
JSP ë²ì ì´ ì¤ì ëì´ ììµëë¤.
 jsp.error.ise_on_clear=ë²í¼ í¬ê¸°ê° 0ì¼ ë clear()ë¥¼ í¸ì¶íë 
ê²ì íì©ëì§ ììµëë¤.
+jsp.error.jspbody.emptybody.only=[{0}] íê·¸ë ì¤ì§ jsp:attributeë§ì 
body ìì ê°ì§ ì ììµëë¤.
 jsp.error.jspbody.required=jsp:attributeê° ì¬ì©ëë ê²½ì°, [{0}]ë¥¼ 
ìí íê·¸ì bodyë¥¼ ëªìíê¸° ìí´ jsp:bodyë¥¼ ì¬ì©í´ì¼ í©ëë¤.
+jsp.error.jspc.missingTarget=targetì´ ìì: ë°ëì -webapp ëë 
-uriroot, ëë íë ì´ìì JSP pagesë¥¼ ëªìíìì¤.
 jsp.error.jspelement.missing.name=íì íëª©ì¸ XML ì¤íì¼ì 'name' 
attributeê° ì¡´ì¬íì§ ììµëë¤.
+jsp.error.jspoutput.conflict=: [{0}]ì´(ê°) ìë¡ ë¤ë¥¸ 
ê°ë¤ë¡ ì¬ë¬ë² ì ìë  ì ììµëë¤. (ì´ì  ê°: [{1}], ì ê· ê°: 
[{2}])
+jsp.error.jsptext.badcontent='<'ê° ì body ë´ì 
ì¡´ì¬í  ëìë ë°ëì CDATA ë´ì í¬í¨ëì´ì¼ í©ëë¤.
+jsp.error.library.invalid=ë¼ì´ë¸ë¬ë¦¬ [{0}]ì ìíë©´ JSP íì´ì§ë 
ì í¨íì§ ììµëë¤: [{1}]
+jsp.error.location=í: [{0}], ì´: [{1}]
 jsp.error.mandatory.attribute=[{0}]: íì attribute [{1}]ì´(ê°) 
ììµëë¤.
+jsp.error.missing_attribute=í´ë¹ TLD ëë íê·¸ íì¼ì ìíë©´, 
attribute [{0}]ì(ë) [{1}] íê·¸ì íì ì¬íìëë¤.
+jsp.error.nested.jspattribute=jsp:attribute íì¤ ì¡ìì ë ë¤ë¥¸ 
jsp:attribute íì¤ ì¡ì ë´ì í¬í¨ë  ì ììµëë¤.
 jsp.error.no.scratch.dir=í JSP ìì§ì scratch ëë í ë¦¬ê° ì¤ì 
ëì§ ìììµëë¤. ì´ Contextë¥¼ ìí´ 
"jsp.initparams=scratchdir="ì servlets.properties íì¼ì 
ì¶ê°íììì¤.
 jsp.error

svn commit: r1848307 [2/3] - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/o

2018-12-06 Thread markt

Modified: 
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_ko.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_ko.properties?rev=1848307&r1=1848306&r2=1848307&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_ko.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_ko.properties 
Thu Dec  6 13:20:22 2018
@@ -13,20 +13,64 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+catalina.noCluster=[{0}](ì¼)ë¡ ì¸íì¬ Cluster RuleSetì ì°¾ì ì 
ììµëë¤. Cluster ì¤ì ì ì¬ì©ë¶ë¥ ìíìëë¤.
 catalina.serverStartFail=íì íëª©ì¸ Server êµ¬ì±ììê° ì ëë¡ 
ììëì§ ëª»íì¬ Tomcatì´ ììë  ì ììµëë¤.
 
 contextConfig.altDDNotFound=alt-dd íì¼ [{0}]ì(ë¥¼) ì°¾ì ì 
ììµëë¤.
 contextConfig.applicationUrl=ì íë¦¬ì¼ì´ì web.xmlì URLì ê²°ì í  
ì ììµëë¤.
 contextConfig.authenticatorConfigured=ë©ìë [{0}]ë¥¼ ìí 
authenticatorë¥¼ ì¤ì íìµëë¤.
+contextConfig.authenticatorInstantiate=í´ëì¤ [{0}]ì authenticator 
ì¸ì¤í´ì¤ë¥¼ ìì±í  ì ììµëë¤,
+contextConfig.contextMissing=context.xmlì´ ì¡´ì¬íì§ ììµëë¤: [{0}]
+contextConfig.defaultError=[{1}]ì ìì¹í [{0}](ì´)ë¼ë ì´ë¦ì 
ê°ì§ ê¸°ë³¸ web.xmlì ì²ë¦¬íë ì¤ ì¤ë¥ ë°ì
+contextConfig.defaultMissing=ê¸ë¡ë² web.xml íì¼ì ì°¾ì ì 
ììµëë¤.
 contextConfig.defaultPosition=[{0}] í, [{1}] ì´ìì ë°ì.
+contextConfig.init=ContextConfig: ì´ê¸°í ì¤
+contextConfig.inputStreamFile=íì¼ [{0}]ì ëíì¬ annotationë¤ì 
ì²ë¦¬íì§ ëª»íìµëë¤.
 contextConfig.inputStreamWebResource=ì¹ ë¦¬ìì¤ [{0}]ì ëí 
annotationë¤ì ì²ë¦¬í  ì ììµëë¤.
+contextConfig.jarFile=Annotationë¤ì ìí´ Jar [{0}]ì(ë¥¼) ì²ë¦¬í  ì 
ììµëë¤.
+contextConfig.jspFile.error=JSP íì¼ [{0}]ì(ë) ë°ëì ''/''ë¡ 
ììí´ì¼ í©ëë¤.
+contextConfig.missingRealm=ì¸ì¦ ì²ë¦¬ë¥¼ í  Realmì´ ì¤ì ëì§ 
ìììµëë¤.
+contextConfig.processAnnotationsDir.debug=[{0}] ëë í ë¦¬ìì ë´ìì 
annotationë¤ì ê°ì§ í´ëì¤ íì¼ë¤ì ì¤ìºí©ëë¤.
+contextConfig.role.auth= ë´ì Security role ì´ë¦ 
[{0}]ì´(ê°)  ë´ì ì ìëì§ ìì ìíìì 
ì¬ì©ëììµëë¤.
+contextConfig.start=ContextConfig: ì²ë¦¬ ìì
+contextConfig.tomcatWebXmlError=/WEB-INF/tomcat-web.xml íì¼ ì²ë¦¬ ì¤ 
ì¤ë¥
+contextConfig.xmlSettings=Context [{0}]ì´ web.xmlê³¼ web-fragment.xml 
íì¼ë¤ì validation:[{1}]ì(ê³¼) namespaceAware:[{2}]ì ì¬ì©íì¬ 
íì±í©ëë¤.
+
+embedded.authenticatorNotInstanceOfValve=ì¤ì ë Authenticatorë Valveê° 
ìëëë¤.
+embedded.notmp=ìì¹ê° [{0}]ì¸ ìì í´ëë¥¼ ì°¾ì ì ììµëë¤.
 
 engineConfig.stop=EngineConfig: ì²ë¦¬ë¥¼ ì¢ë£í¨.
 
+expandWar.createFailed=ëë í ë¦¬ [{0}]ì(ë¥¼) ìì±í  ì ììµëë¤.
+expandWar.illegalPath=í´ë¹ ìì¹´ì´ë¸ [{0}]ì ë¬¸ì ê° ìì´ ë¬´ìë  
ê²ìëë¤: ìì¹´ì´ë¸ì í ìí¸ë¦¬ê° íì©ëì§ ìë ê²½ë¡ 
[{1}]ì(ë¥¼) í¬í¨íê³  ìì¼ë©° ì´ë  ì ìë docBase [{3}] ì¸ë¶ì 
ì¡´ì¬íê¸° ëë¬¸ì [{2}]ì ìì¶í´ì  ëì§ ìììµëë¤.
+
+hostConfig.context.remove=Context [{0}]ì(ë¥¼) ì ê±°íë ì¤ ì¤ë¥ ë°ì
+hostConfig.deployDescriptor.blocked=Context ê²½ë¡ [{0}]ì¸ í´ë¹ ì¹ ì 
íë¦¬ì¼ì´ìì´ ë°°ì¹ëì§ ëª»íìµëë¤. ì´ì ë í´ë¹ ì 
íë¦¬ì¼ì´ìì ìì í ë°°ì¹ì íìí ì¤ì ë¤ì´ deployment 
descriptor [{1}]ì í¬í¨ëì´ ìì¼ë ì´ í¸ì¤í¸ì deployXML ì¤ì ì 
ìí´ deployment descriptorë¤ì ì²ë¦¬ê° ëì§ ìììì¼ ì 
ììµëë¤. ì´ ì íë¦¬ì¼ì´ìì ë°°ì¹íê¸° ìí´ìë ì í©í 
descriptorê° [{2}]ì ìì±ëì´ì¼ í©ëë¤.
+hostConfig.deployDescriptor.error=Deployment descriptor [{0}]ì(ë¥¼) 
ë°°ì¹íë ì¤ ì¤ë¥ ë°ì
+hostConfig.deployDescriptor.finished=Deployment descriptor [{0}]ì ë°°ì¹ê° 
[{1}] ë°ë¦¬ì´ì ìë£ëììµëë¤.
+hostConfig.deployDescriptor.localDocBaseSpecified=í´ë¹ í¸ì¤í¸ appBase 
ë´ì docBase [{0}]ì´(ê°) ëªìëìëë°, ì´ë ë¬´ìë  ê²ìëë¤.
 hostConfig.deployDir=ì¹ ì íë¦¬ì¼ì´ìì ëë í ë¦¬ [{0}]ì 
ë°°ì¹í©ëë¤:
 hostConfig.deployWar.error=ì¹ ì íë¦¬ì¼ì´ì ìì¹´ì´ë¸ [{0}]ì(ë¥¼) 
ë°°ì¹íë ê³¼ì ìì ì¤ë¥ ë°ì
+hostConfig.deployWar.hiddenDir=í´ë¹ WAR [{1}]ì(ë) ì°ì ììê° ëê² 
ì²ë¦¬ëì´ì¼ íê³  unpackWARsê° falseì´ê¸° ëë¬¸ì í´ë¹ ëë í ë¦¬ 
[{0}]ì(ë) ë¬´ìë©ëë¤.
+hostConfig.deployWar.threaded.error=WAR íì¼ë¤ì ëí´ ë©í° ì°ë ë 
ë°°ì¹ ììë¤ì´ ìë£ëê¸°ê¹ì§ ëê¸°íë ì¤ ì¤ë¥ ë°ì
 hostConfig.docBaseUrlInvalid=ì ê³µë docBaseë URLë¡ì íìë  ì 
ìì

svn commit: r1848308 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ java/org/apache/catalina/core/ java/org/apache/catalina/deploy/ java/org/apache/catalina/ha/deploy/ java/org/apache/cat

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 13:22:10 2018
New Revision: 1848308

URL: http://svn.apache.org/viewvc?rev=1848308&view=rev
Log:
Sync Chinese (simplified) translations with POEditor

Added:

tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings_zh_CN.properties 
  (with props)
Modified:

tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/coyote/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties?rev=1848308&r1=1848307&r2=1848308&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
 Thu Dec  6 13:22:10 2018
@@ -38,6 +38,7 @@ singleSignOn.debug.cookieCheck=SSOæ£
 singleSignOn.debug.cookieNotFound=SSOæ²¡ææ¾å°SSO cookie
 singleSignOn.debug.principalFound=SSO 
æ¾å°äºå¸¦çè®¤è¯ç±»åçç¼åä»£ç
 singleSignOn.debug.removeSession=SSO ä» SSO session [{1}] ä¸å 
é¤åºç¨ç¨åºä¼è¯ [{0}]
+singleSignOn.debug.update=SSO æ´æ°SSO ä¼è¯[{0}] å¯¹è®¤è¯ ç±»å[{1}]
 singleSignOn.sessionExpire.hostNotFound=å ä¸º Host ä¸¢å¤±ï¼SSO æ æ³ä½¿ 
session [{0}] å¤±æ
 
singleSignOn.sessionExpire.managerError=ç±äºä¼è¯ç®¡çå¨å¨æ£ç´¢ä¼è¯æ¶æåºå¼å¸¸ï¼å¯¼è´åç¹ç»å½æ
 æ³ä½¿ä¼è¯[{0}]å¤±æ
 

Modified: 
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_zh_CN.properties?rev=1848308&r1=1848307&r2=1848308&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_zh_CN.properties 
Thu Dec  6 13:22:10 2018
@@ -26,10 +26,11 @@ applicationContext.setSessionTracking.is
 applicationDispatcher.specViolation.response=åå§çServletResponseæåè£
åçServletResponseæªä¼ éç»RequestDispatcherï¼åå 
ï¼è¿åäºSRV.8.2åSRV.14.2.5.1\n\
 \n
 
+applicationFilterConfig.release=å¤±è´¥çéæ¯è¿æ»¤å¨ç±»åä¸º[{1}]åç§°ä¸º[{0}]
+
 
applicationFilterRegistration.nullInitParams=ç±äºnameå(æ)valueä¸ºnullï¼æ
 æ³ä¸ºè¿æ»¤å¨è®¾ç½®åå§ååæ°ãnameä¸º [{0}]ï¼valueä¸º [{1}]
 
 applicationPushBuilder.methodNotToken=HTTPæ¹æ³å¿é¡»æ¯ä»¤ç(token)ï¼ä½ 
[{0}] åå«éä»¤çåç¬¦
-applicationPushBuilder.noCoyoteRequest=æ 
æ³ä»è¯¥ç±»å[{0}]è¯·æ±ä¸è·ååºå±Coyoteçè¯·æ±çå¯¹è±¡ï¼è¿ä¸ªå¯¹è±¡è¢«ç¨æ¥åå»ºä¸ä¸ªæ¨éè¯·æ±ï¼
 
 aprListener.aprInitError=åºäºAPRçæ¬å°åºå è½½å¤±è´¥.éè¯¯æ¥åä¸º[{0}]
 aprListener.initializeFIPSSuccess=æåçè¿å¥FIPS æ¨¡å¼
@@ -87,6 +88,8 @@ standardHost.notContext=ä¸»æºç
 
 
standardServer.accept.timeout=å¨è°ç¨accept()æ¹æ³ä¹åï¼ä¾¦å¬shutdownå½ä»¤çå¥æ¥åç»åäºæå¤çè¶
æ¶[{0}]æ¯«ç§ã è¿æ¯bug 56684çä¸ä¸ªä¾åï¼
 
+standardService.engine.stopFailed=å¤±è´¥åæ¢å³èçå¼æ
+
 standardWrap

svn commit: r1848309 - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/connector/ java/org/apache/catalin

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 13:23:42 2018
New Revision: 1848309

URL: http://svn.apache.org/viewvc?rev=1848309&view=rev
Log:
Sync German translations with POEditor

Added:
tomcat/trunk/java/javax/servlet/LocalStrings_de.properties   (with props)
tomcat/trunk/java/javax/servlet/http/LocalStrings_de.properties   (with 
props)

tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_de.properties
   (with props)

tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings_de.properties
   (with props)

tomcat/trunk/java/org/apache/catalina/tribes/util/LocalStrings_de.properties   
(with props)
tomcat/trunk/java/org/apache/naming/LocalStrings_de.properties   (with 
props)
tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings_de.properties   
(with props)
Modified:
tomcat/trunk/java/javax/el/LocalStrings_de.properties

tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties

tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_de.properties

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings_de.properties

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_de.properties

tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/util/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_de.properties
tomcat/trunk/java/org/apache/coyote/LocalStrings_de.properties
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_de.properties
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_de.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_de.properties
tomcat/trunk/java/org/apache/tomcat/util/LocalStrings_de.properties

tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_de.properties
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_de.properties

tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings_de.properties
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_de.properties
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_de.properties

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_de.properties
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_de.properties

tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_de.properties
tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_de.properties

Modified: tomcat/trunk/java/javax/el/LocalStrings_de.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/LocalStrings_de.properties?rev=1848309&r1=1848308&r2=1848309&view=diff
==
--- tomcat/trunk/java/javax/el/LocalStrings_de.properties (original)
+++ tomcat/trunk/java/javax/el/LocalStrings_de.properties Thu Dec  6 13:23:42 
2018
@@ -13,4 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+elProcessor.defineFunctionInvalidClass=Die Klasse [{0}] ist nicht Ã¶ffentlich
+
 importHandler.invalidClassNameForStatic=UngÃ¼ltige Klasse [{0}] fÃ¼r 
angegebenen static import [{1}]

Added: tomcat/trunk/java/javax/servlet/LocalStrings_de.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/LocalStrings_de.properties?rev=1848309&view=auto
==
--- tomcat/trunk/java/javax/servlet/LocalStrings_de.properties (added)
+++ tomcat/trunk/java/javax/servlet/LocalStrings_de.properties Thu Dec  6 
13:23:42 2018
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you

svn commit: r1848306 [2/2] - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/ap

2018-12-06 Thread markt

Modified: tomcat/trunk/java/org/apache/catalina/users/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/LocalStrings_ja.properties?rev=1848306&r1=1848305&r2=1848306&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/users/LocalStrings_ja.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/users/LocalStrings_ja.properties 
[UTF-8] Thu Dec  6 13:17:51 2018
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 memoryUserDatabase.fileClose=[{0}]のクローズに失敗しました
+memoryUserDatabase.fileNotFound=ユーザー情報データベースとして指定された [{0}] は存在しません。
 memoryUserDatabase.nullRole=NULLまたは長さゼロのロール名が指定されています。 ロールは無視されます。
 memoryUserDatabase.renameNew=新しいファイル名を [{0}] に変更できません
 memoryUserDatabase.renameOld=元のファイル名を [{0}] に変更できません

Modified: tomcat/trunk/java/org/apache/catalina/util/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LocalStrings_ja.properties?rev=1848306&r1=1848305&r2=1848306&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/LocalStrings_ja.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/util/LocalStrings_ja.properties 
[UTF-8] Thu Dec  6 13:17:51 2018
@@ -15,6 +15,7 @@
 
 SecurityUtil.doAsPrivilege=PrivilegedExceptionActionブロックを実行中に例外が発生しました。
 
+customObjectInputStream.logRequired=ロギングによるクラス名のフィルタリングには有効なロガーが必要です
 customObjectInputStream.nomatch=クラス [{0}] はデシリアライズの許可されたクラス名の正規表現 [{1}] 
にマッチしません。
 
 extensionValidator.extension-not-found-error=ExtensionValidator[{0}][{1}]: 
必要な拡張 [{2}] が見つかりません。
@@ -25,8 +26,17 @@ extensionValidator.web-application-manif
 hexUtil.bad=無効な16進数値です
 hexUtil.odd=奇数桁の16進数値です
 
+introspection.classLoadFailed=クラス [{0}] の読み込みに失敗しました。
+
+lifecycleBase.initFail=コンポーネント[{0}] の初期化に失敗しました。
+
+lifecycleMBeanBase.registerFail=コンポーネントの初期化時にオブジェクト [{0}] を名前 [{1}] 
で登録できませんでした。
+
+netmask.cidrNegative=CIDR [{0}] に負の値が指定されています。
+
 parameterMap.locked=ロックされたParameterMapは変更が許されません
 
 resourceSet.locked=ロックされたResourceSetは変更が許されません
 
 sessionIdGeneratorBase.random=クラス [{0}] の乱数発生器の初期化の例外です
+sessionIdGeneratorBase.randomProvider=プロバイダ[{0}]を使用して乱数ジェネレータを初期化中に例外が発生しました

Modified: 
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties?rev=1848306&r1=1848305&r2=1848306&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties 
[UTF-8] Thu Dec  6 13:17:51 2018
@@ -14,6 +14,8 @@
 # limitations under the License.
 
 accessLogValve.closeFail=アクセスログのクローズに失敗しました
+accessLogValve.invalidLocale=[{0}] をロケールに設定できませんでした。
+accessLogValve.openFail=アクセスログファイル [{0}] を開けません。
 accessLogValve.rotateFail=アクセスログのローテーションに失敗しました
 
 errorReportValve.description=説明
@@ -27,9 +29,21 @@ errorReportValve.statusReport=ステー�
 errorReportValve.unknownReason=未知の理由
 
 http.402.desc=このステータスコードは、将来の使用のために予約されています
+http.403.desc=サーバーはリクエストの認証を拒否しました。
+http.404.reason=見つかりません。
+http.405.desc=リクエストラインで受信されたメソッドは、オリジンサーバーによって認識されますが、ターゲットリソースによってサポートされていません。
 http.407.reason=プロキシ認証が必要です。
+http.412.reason=前提条件失敗
 http.415.reason=未対応のメディアタイプです。
+http.423.desc=メソッド呼び出しの依頼元リソース、あるいは依頼先リソースはロックされています。
+http.423.reason=ロックされています
 http.426.reason=アップグレードが必要です。
+http.428.desc=オリジンサーバーは、要求が条件付きであることを要求します。
 http.429.reason=大量のリクエストが発生しています。
+http.502.desc=ゲートウェイあるいはプロキシサーバーからリクエストを試みた内部サーバーから不正なレスポンスを受信しました。
+http.507.reason=ストレージに充分な空き容量がありません。
+http.511.desc=クライアントはネットワークアクセスを取得するために認証する必要があります。
 
 jdbcAccessLogValve.exception=アクセスエントリの挿入を実行中の例外です
+
+sslValve.invalidProvider=リクエスト [{0}] に関連付けられたコネクターへ不正な SSL 
プロバイダーが構成されています。証明書データを処理できません。

Added: 
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_ja.properties?rev=1848306&view=auto
==
--- 
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_ja.properties 
(added)
+++ 
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_ja.properties 
Thu Dec  6 13:17:51 2018
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless requ

Re: open visibility of JavaClassCacheEntry

2018-12-06 Thread Mark Thomas

On 06/12/2018 13:19, Romain Manni-Bucau wrote:
> Hello Rémy,
> 
> 
> Le jeu. 6 déc. 2018 à 14:13, Rémy Maucherat  a écrit :
> 
>> On Thu, Dec 6, 2018 at 11:51 AM Romain Manni-Bucau 
>> wrote:
>>
>>> Hi guys,
>>>
>>> can you make ContextConfig.JavaClassCacheEntry public please? Idea is to
>> be
>>> able to override ContextConfig and potentially customize
>> processAnnotations
>>> methods. Currently it is a pain and it is preventing to upgrade
>> meecrowave
>>> and likely tomee to java11+jlink support
>>>
>>
>> Ok, so I had a look at the meecrowave main class after doing my embedded
>> refactoring and I was a bit horrified by the amount of hacks :) Not that
>> there were too many options to do the things that were done (some I didn't
>> think were possible), and luckily my changes would have been a very good
>> help there.
>>
>> So here, it looks like a bit scary as well, since JavaClassCacheEntry is
>> package private (not ok usually), but only instantiated from a private
>> method (what would you do about that ?). So I'd rather not do that, or not
>> just that, since it would be good to reduce the amount of hacks.
>>
>> For starters, I don't like "private" in that kind of class (same with
>> "final"), I prefer "protected" usually. Shouldn't JavaClassCacheEntry be a
>> non static protected class ?

No objections to making it protected if that helps but I don't see why
you'd want to make it non-static.

>> About webConfig, I'm not sure. A good way to do it would be to add calls to
>> a few intermediate empty methods in appropriate locations, rather than a
>> real refactoring.
> 
> not empty cause here the idea is to reuse an existing scanning and not let
> tomcat scan classes but yes a doScanMagic() would work
> the part which would be great to reuse is the mapping between bytecode (the
> annotation entry) and the tomcat model (FilterDef etc)

Why don't you suggest a patch? As a rough guideline, please aim for the
minimally invasive patch the gives you what you need.

Generally adding to the existing API is OK but changing it is not. The
aim is to minimise the chance of breakage for anyone currently using or
extending that class directly.

Mark

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

Re: svn commit: r1848225 - in /tomcat/trunk/java/org/apache/catalina/loader: LocalStrings.properties WebappClassLoaderBase.java WebappLoader.java

2018-12-06 Thread Mark Thomas

On 05/12/2018 20:40, Rémy Maucherat wrote:
> On Wed, Dec 5, 2018 at 9:17 PM Mark Thomas  wrote:
> 
>> On 05/12/2018 20:03, Rémy Maucherat wrote:
>>> On Wed, Dec 5, 2018 at 5:37 PM  wrote:
>>>
 Author: remm
 Date: Wed Dec  5 16:37:42 2018
 New Revision: 1848225

 URL: http://svn.apache.org/viewvc?rev=1848225&view=rev
 Log:
 Add i18n for the loader package.

 I have at least 350 more strings to add.
>>>
>>> I don't know what to do with:
>>> - the bootstrap.jar strings: nothing ?
>>
>> Refactor StringManager to JULI? It is somewhat logging related so that
>> doesn't seem completely crazy.
>>
> 
> Ok, why not.

Apart from the fact it would mean touching almost every class in Tomcat?

Seriously, the more I think about it the more I like it. Move the res
package from o.a.tomcat.util.res o.a.juli.res and deprecate the old one
along with the copy in tribes. And then remove the old ones in 10.x

>>> - the "upstream" strings: dbcp, pool, bcel, fileupload
>>
>> We could 'fix' them. It would mean the code diverging further from the
>> original which will make syncing harder. Roughly how many Strings are we
>> talking about here?
>>
> 
> About 200.

Hmm. DBCP2 already has simple l10n support along the lines of:

private static final ResourceBundle messages = ResourceBundle.getBundle(
Utils.class.getPackage().getName() + ".LocalStrings");

That could be extended. Every ASF committer has commit access to Commons
so I guess it could just be fixed at source. I'll volunteer to merge the
changes back into Tomcat.

Pool2 doesn't use a ResourceBundle but I don't see why it couldn't. Same
for FileUpload.

BCEL code is so far removed from Commons BCEL I'd probably just fix it
locally.

Mark

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

Re: open visibility of JavaClassCacheEntry

2018-12-06 Thread Romain Manni-Bucau

Fair enough, done in https://bz.apache.org/bugzilla/show_bug.cgi?id=62986

Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | Book



Le jeu. 6 déc. 2018 à 14:32, Mark Thomas  a écrit :

> On 06/12/2018 13:19, Romain Manni-Bucau wrote:
> > Hello Rémy,
> >
> >
> > Le jeu. 6 déc. 2018 à 14:13, Rémy Maucherat  a écrit :
> >
> >> On Thu, Dec 6, 2018 at 11:51 AM Romain Manni-Bucau <
> rmannibu...@gmail.com>
> >> wrote:
> >>
> >>> Hi guys,
> >>>
> >>> can you make ContextConfig.JavaClassCacheEntry public please? Idea is
> to
> >> be
> >>> able to override ContextConfig and potentially customize
> >> processAnnotations
> >>> methods. Currently it is a pain and it is preventing to upgrade
> >> meecrowave
> >>> and likely tomee to java11+jlink support
> >>>
> >>
> >> Ok, so I had a look at the meecrowave main class after doing my embedded
> >> refactoring and I was a bit horrified by the amount of hacks :) Not that
> >> there were too many options to do the things that were done (some I
> didn't
> >> think were possible), and luckily my changes would have been a very good
> >> help there.
> >>
> >> So here, it looks like a bit scary as well, since JavaClassCacheEntry is
> >> package private (not ok usually), but only instantiated from a private
> >> method (what would you do about that ?). So I'd rather not do that, or
> not
> >> just that, since it would be good to reduce the amount of hacks.
> >>
> >> For starters, I don't like "private" in that kind of class (same with
> >> "final"), I prefer "protected" usually. Shouldn't JavaClassCacheEntry
> be a
> >> non static protected class ?
>
> No objections to making it protected if that helps but I don't see why
> you'd want to make it non-static.
>
> >> About webConfig, I'm not sure. A good way to do it would be to add
> calls to
> >> a few intermediate empty methods in appropriate locations, rather than a
> >> real refactoring.
> >
> > not empty cause here the idea is to reuse an existing scanning and not
> let
> > tomcat scan classes but yes a doScanMagic() would work
> > the part which would be great to reuse is the mapping between bytecode
> (the
> > annotation entry) and the tomcat model (FilterDef etc)
>
> Why don't you suggest a patch? As a rough guideline, please aim for the
> minimally invasive patch the gives you what you need.
>
> Generally adding to the existing API is OK but changing it is not. The
> aim is to minimise the chance of breakage for anyone currently using or
> extending that class directly.
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

[Bug 62986] New: Enable to override ContextConfig.webConfig class scanning

2018-12-06 Thread bugzilla

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

Bug ID: 62986
   Summary: Enable to override ContextConfig.webConfig class
scanning
   Product: Tomcat 9
   Version: unspecified
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: rmannibu...@gmail.com
  Target Milestone: -

ContextConfig class processing uses not accessible classes (package scope)
which prevents to override cleanly the scanning. Would be neat to enable
vendors to do that.

-- 
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 62986] Enable to override ContextConfig.webConfig class scanning

2018-12-06 Thread bugzilla

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

--- Comment #1 from romain.manni-bucau  ---
Created attachment 36297
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=36297&action=edit
Diff proposal

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1848225 - in /tomcat/trunk/java/org/apache/catalina/loader: LocalStrings.properties WebappClassLoaderBase.java WebappLoader.java

2018-12-06 Thread Rémy Maucherat

On Thu, Dec 6, 2018 at 2:42 PM Mark Thomas  wrote:

> > Ok, why not.
>
> Apart from the fact it would mean touching almost every class in Tomcat?
>
> Seriously, the more I think about it the more I like it. Move the res
> package from o.a.tomcat.util.res o.a.juli.res and deprecate the old one
> along with the copy in tribes. And then remove the old ones in 10.x
>

There's another problem with that startup package where the bundles of the
actual bootstrap are shared with the rest (ContextConfig, etc). Also, is it
really good to start shipping plenty of resources in a "small" bootstrap ?
Open questions.

>
> >>> - the "upstream" strings: dbcp, pool, bcel, fileupload
> >>
> >> We could 'fix' them. It would mean the code diverging further from the
> >> original which will make syncing harder. Roughly how many Strings are we
> >> talking about here?
> >>
> >
> > About 200.
>
> Hmm. DBCP2 already has simple l10n support along the lines of:
>
> private static final ResourceBundle messages = ResourceBundle.getBundle(
> Utils.class.getPackage().getName() + ".LocalStrings");
>
> That could be extended. Every ASF committer has commit access to Commons
> so I guess it could just be fixed at source. I'll volunteer to merge the
> changes back into Tomcat.
>
> Pool2 doesn't use a ResourceBundle but I don't see why it couldn't. Same
> for FileUpload.
>
> BCEL code is so far removed from Commons BCEL I'd probably just fix it
> locally.
>

Ok. OTOH about DBCP it's surprising there's something because in other
places you find this kind of code which means nobody cares at all:
stringBuilder.append(NUPROP_WARNTEXT.get(propertyName)).append(" You have
set value of \"")
.append(propertyValue).append("\" for
\"").append(propertyName)
.append("\" property, which is being ignored.");

For sure fixing this will be done last ;)

Rémy

svn commit: r1848320 - in /tomcat/trunk: java/org/apache/catalina/valves/RemoteIpValve.java test/org/apache/catalina/valves/TestRemoteIpValve.java webapps/docs/changelog.xml

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 14:30:51 2018
New Revision: 1848320

URL: http://svn.apache.org/viewvc?rev=1848320&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62978
Update the RemoteIpValve to handle multiple values in the x-forwarded-proto 
header.
Patch provided by Tom Groot.

Modified:
tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=1848320&r1=1848319&r2=1848320&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Thu Dec  6 
14:30:51 2018
@@ -60,7 +60,7 @@ import org.apache.tomcat.util.http.MimeH
  * otherwise, the ip/host is declared to be the remote ip and looping is 
stopped.
  * 
  * 
- * If the request http header named $protocolHeader (e.g. 
x-forwarded-for) equals to the value of
+ * If the request http header named $protocolHeader (e.g. 
x-forwarded-proto) consists only of forwards that match
  * protocolHeaderHttpsValue configuration parameter (default 
https) then request.isSecure = true,
  * request.scheme = https and request.serverPort = 
443. Note that 443 can be overwritten with the
  * $httpsServerPort configuration parameter.
@@ -642,7 +642,7 @@ public class RemoteIpValve extends Valve
 if (protocolHeaderValue == null) {
 // don't modify the secure,scheme and serverPort attributes
 // of the request
-} else if 
(protocolHeaderHttpsValue.equalsIgnoreCase(protocolHeaderValue)) {
+} else if 
(isForwardedProtoHeaderValueSecure(protocolHeaderValue)) {
 request.setSecure(true);
 // use request.coyoteRequest.scheme instead of 
request.setScheme() because request.setScheme() is no-op in Tomcat 6.0
 request.getCoyoteRequest().scheme().setString("https");
@@ -709,6 +709,26 @@ public class RemoteIpValve extends Valve
 }
 }
 
+/**
+ * Considers the value to be secure if it exclusively holds forwards for
+ * {@link #protocolHeaderHttpsValue}.
+ */
+private boolean isForwardedProtoHeaderValueSecure(String 
protocolHeaderValue) {
+if (!protocolHeaderValue.contains(",")) {
+return 
protocolHeaderHttpsValue.equalsIgnoreCase(protocolHeaderValue);
+}
+String[] forwardedProtocols = 
commaDelimitedListToStringArray(protocolHeaderValue);
+if (forwardedProtocols.length == 0) {
+return false;
+}
+for (int i = 0; i < forwardedProtocols.length; i++) {
+if 
(!protocolHeaderHttpsValue.equalsIgnoreCase(forwardedProtocols[i])) {
+return false;
+}
+}
+return true;
+}
+
 private void setPorts(Request request, int defaultPort) {
 int port = defaultPort;
 if (portHeader != null) {

Modified: tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java?rev=1848320&r1=1848319&r2=1848320&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java Thu Dec 
 6 14:30:51 2018
@@ -684,6 +684,107 @@ public class TestRemoteIpValve {
 }
 
 @Test
+public void 
testInvokeXforwardedProtoSaysMultipleHttpsForwardsForIncomingHttpsRequest() 
throws Exception {
+performXForwardedProtoWithMultipleForwardsTest("https,https", true, 
true);
+}
+
+@Test
+public void 
testInvokeXforwardedProtoSaysMultipleForwardsWithFirstBeingHttpForIncomingHttpsRequest()
 throws Exception {
+performXForwardedProtoWithMultipleForwardsTest("http,https", true, 
false);
+}
+
+@Test
+public void 
testInvokeXforwardedProtoSaysMultipleForwardsWithLastBeingHttpForIncomingHttpsRequest()
 throws Exception {
+performXForwardedProtoWithMultipleForwardsTest("https,http", false, 
false);
+}
+
+@Test
+public void 
testInvokeXforwardedProtoSaysMultipleForwardsWithMiddleBeingHttpForIncomingHttpsRequest()
 throws Exception {
+performXForwardedProtoWithMultipleForwardsTest("https,http,https", 
true, false);
+}
+
+@Test
+public void 
testInvokeXforwardedProtoSaysMultipleHttpForwardsForIncomingHttpsRequest() 
throws Exception {
+performXForwardedProtoWithMultipleForwardsTest("http,http", false, 
false);
+}
+
+@Test
+public void 
testInvokeXforwarded

svn commit: r1848321 - /tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 14:33:50 2018
New Revision: 1848321

URL: http://svn.apache.org/viewvc?rev=1848321&view=rev
Log:
Remove out of date comments

Modified:
tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java

Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=1848321&r1=1848320&r2=1848321&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Thu Dec  6 
14:33:50 2018
@@ -621,8 +621,6 @@ public class RemoteIpValve extends Valve
 request.setRemoteAddr(remoteIp);
 request.setRemoteHost(remoteIp);
 
-// use 
request.coyoteRequest.mimeHeaders.setValue(str).setString(str) because 
request.addHeader(str, str) is no-op in Tomcat
-// 6.0
 if (proxiesHeaderValue.size() == 0) {
 
request.getCoyoteRequest().getMimeHeaders().removeHeader(proxiesHeader);
 } else {
@@ -644,15 +642,11 @@ public class RemoteIpValve extends Valve
 // of the request
 } else if 
(isForwardedProtoHeaderValueSecure(protocolHeaderValue)) {
 request.setSecure(true);
-// use request.coyoteRequest.scheme instead of 
request.setScheme() because request.setScheme() is no-op in Tomcat 6.0
 request.getCoyoteRequest().scheme().setString("https");
-
 setPorts(request, httpsServerPort);
 } else {
 request.setSecure(false);
-// use request.coyoteRequest.scheme instead of 
request.setScheme() because request.setScheme() is no-op in Tomcat 6.0
 request.getCoyoteRequest().scheme().setString("http");
-
 setPorts(request, httpServerPort);
 }
 }
@@ -686,15 +680,11 @@ public class RemoteIpValve extends Valve
 } finally {
 request.setRemoteAddr(originalRemoteAddr);
 request.setRemoteHost(originalRemoteHost);
-
 request.setSecure(originalSecure);
-
-MimeHeaders headers = request.getCoyoteRequest().getMimeHeaders();
-// use request.coyoteRequest.scheme instead of request.setScheme() 
because request.setScheme() is no-op in Tomcat 6.0
 request.getCoyoteRequest().scheme().setString(originalScheme);
-
 request.setServerPort(originalServerPort);
 
+MimeHeaders headers = request.getCoyoteRequest().getMimeHeaders();
 if (originalProxiesHeader == null || 
originalProxiesHeader.length() == 0) {
 headers.removeHeader(proxiesHeader);
 } else {



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

svn commit: r1848322 - in /tomcat/trunk: java/org/apache/catalina/filters/RemoteIpFilter.java java/org/apache/catalina/valves/RemoteIpValve.java webapps/docs/changelog.xml

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 14:39:29 2018
New Revision: 1848322

URL: http://svn.apache.org/viewvc?rev=1848322&view=rev
Log:
Update the RemoteIpFilter to handle multiple values in the x-forwarded-proto 
header.
Based on a patch provided by Tom Groot.

Modified:
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1848322&r1=1848321&r2=1848322&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Thu Dec  
6 14:39:29 2018
@@ -77,7 +77,7 @@ import org.apache.tomcat.util.http.FastH
  * otherwise, the ip/host is declared to be the remote ip and looping is 
stopped.
  * 
  * 
- * If the request http header named $protocolHeader (e.g. 
x-forwarded-for) equals to the value of
+ * If the request http header named $protocolHeader (e.g. 
x-forwarded-proto) consists only of forwards that match
  * protocolHeaderHttpsValue configuration parameter (default 
https) then request.isSecure = true,
  * request.scheme = https and request.serverPort = 
443. Note that 443 can be overwritten with the
  * $httpsServerPort configuration parameter.
@@ -805,8 +805,9 @@ public class RemoteIpFilter extends Gene
 if (protocolHeader != null) {
 String protocolHeaderValue = request.getHeader(protocolHeader);
 if (protocolHeaderValue == null) {
-// don't modify the secure,scheme and serverPort 
attributes of the request
-} else if 
(protocolHeaderHttpsValue.equalsIgnoreCase(protocolHeaderValue)) {
+// Don't modify the secure, scheme and serverPort 
attributes
+// of the request
+} else if 
(isForwardedProtoHeaderValueSecure(protocolHeaderValue)) {
 xRequest.setSecure(true);
 xRequest.setScheme("https");
 setPorts(xRequest, httpsServerPort);
@@ -850,6 +851,26 @@ public class RemoteIpFilter extends Gene
 
 }
 
+/*
+ * Considers the value to be secure if it exclusively holds forwards for
+ * {@link #protocolHeaderHttpsValue}.
+ */
+private boolean isForwardedProtoHeaderValueSecure(String 
protocolHeaderValue) {
+if (!protocolHeaderValue.contains(",")) {
+return 
protocolHeaderHttpsValue.equalsIgnoreCase(protocolHeaderValue);
+}
+String[] forwardedProtocols = 
commaDelimitedListToStringArray(protocolHeaderValue);
+if (forwardedProtocols.length == 0) {
+return false;
+}
+for (int i = 0; i < forwardedProtocols.length; i++) {
+if 
(!protocolHeaderHttpsValue.equalsIgnoreCase(forwardedProtocols[i])) {
+return false;
+}
+}
+return true;
+}
+
 private void setPorts(XForwardedRequest xrequest, int defaultPort) {
 int port = defaultPort;
 if (getPortHeader() != null) {

Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=1848322&r1=1848321&r2=1848322&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Thu Dec  6 
14:39:29 2018
@@ -638,7 +638,7 @@ public class RemoteIpValve extends Valve
 if (protocolHeader != null) {
 String protocolHeaderValue = request.getHeader(protocolHeader);
 if (protocolHeaderValue == null) {
-// don't modify the secure,scheme and serverPort attributes
+// Don't modify the secure, scheme and serverPort 
attributes
 // of the request
 } else if 
(isForwardedProtoHeaderValueSecure(protocolHeaderValue)) {
 request.setSecure(true);
@@ -699,7 +699,7 @@ public class RemoteIpValve extends Valve
 }
 }
 
-/**
+/*
  * Considers the value to be secure if it exclusively holds forwards for
  * {@link #protocolHeaderHttpsValue}.
  */

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1848322&r1=1848321&r2=1848322&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Dec  6 14:39:29 2018
@@ -119,6 +119

svn commit: r1848323 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/valves/RemoteIpValve.java test/org/apache/catalina/valves/TestRemoteIpValve.java webapps/docs/changelog.xml

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 14:41:29 2018
New Revision: 1848323

URL: http://svn.apache.org/viewvc?rev=1848323&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62978
Update the RemoteIpValve to handle multiple values in the x-forwarded-proto 
header.
Patch provided by Tom Groot.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  6 14:41:29 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1

svn commit: r1848324 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/valves/RemoteIpValve.java

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 14:41:56 2018
New Revision: 1848324

URL: http://svn.apache.org/viewvc?rev=1848324&view=rev
Log:
Remove out of date comments

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  6 14:41:56 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763

svn commit: r1848325 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/filters/RemoteIpFilter.java java/org/apache/catalina/valves/RemoteIpValve.java webapps/docs/changelog.xml

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 14:42:17 2018
New Revision: 1848325

URL: http://svn.apache.org/viewvc?rev=1848325&view=rev
Log:
Update the RemoteIpFilter to handle multiple values in the x-forwarded-proto 
header.
Based on a patch provided by Tom Groot.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  6 14:42:17 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,

svn commit: r1848326 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/RemoteIpValve.java test/org/apache/catalina/valves/TestRemoteIpValve.java webapps/docs/changelog.xml

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 14:43:41 2018
New Revision: 1848326

URL: http://svn.apache.org/viewvc?rev=1848326&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62978
Update the RemoteIpValve to handle multiple values in the x-forwarded-proto 
header.
Patch provided by Tom Groot.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  6 14:43:41 2018
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072

svn commit: r1848327 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/RemoteIpValve.java

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 14:44:00 2018
New Revision: 1848327

URL: http://svn.apache.org/viewvc?rev=1848327&view=rev
Log:
Remove out of date comments

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  6 14:44:00 2018
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305,1821303-1821311,1821313,1821316,1821330,1821365,1822235,1823165,1823341,1823490,1823493,1823498,1824299,1824313,1825715,1825874,1826367,1826379,1826690,1826830,1826874-1826875,1827864,18

svn commit: r1848328 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/filters/RemoteIpFilter.java java/org/apache/catalina/valves/RemoteIpValve.java webapps/docs/changelog.xml

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 14:45:08 2018
New Revision: 1848328

URL: http://svn.apache.org/viewvc?rev=1848328&view=rev
Log:
Update the RemoteIpFilter to handle multiple values in the x-forwarded-proto 
header.
Based on a patch provided by Tom Groot.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  6 14:45:08 2018
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,181722

[Bug 62978] RemoteIpValve: Multiple forwards in X-Forwarded-Proto header not supported

2018-12-06 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #2 from Mark Thomas  ---
Thanks for the report, test cases and patch. As bug reports go, this one was
ideal.

Fixed in:
- trunk for 9.0.14 onwards
- 8.5.x for 8.5.36 onwards
- 7.0.x for 7.0.93 onwards

I also applied a very similar patch to the RemoteIpFilter that uses almost
identical code.

-- 
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: r1848329 - in /tomcat/trunk/java/org/apache/catalina/session: LocalStrings.properties PersistentManagerBase.java

2018-12-06 Thread remm

Author: remm
Date: Thu Dec  6 15:04:24 2018
New Revision: 1848329

URL: http://svn.apache.org/viewvc?rev=1848329&view=rev
Log:
Add i18n for the session package.

Modified:
tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java

Modified: tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties?rev=1848329&r1=1848328&r2=1848329&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties 
[UTF-8] Thu Dec  6 15:04:24 2018
@@ -44,9 +44,14 @@ managerBase.setContextNotNew=It is illeg
 
 persistentManager.backupMaxIdle=Backing up session [{0}] to Store, idle for 
[{1}] seconds
 persistentManager.deserializeError=Error deserializing Session [{0}]: [{1}]
+persistentManager.isLoadedError=Error checking if session [{0}] is loaded in 
memory
 persistentManager.loading=Loading [{0}] persisted sessions
+persistentManager.removeError=Error removing session [{0}] from the store
 persistentManager.serializeError=Error serializing Session [{0}]: [{1}]
+persistentManager.storeClearError=Error clearning all sessions from the store
 persistentManager.storeKeysException=Unable to determine the list of session 
IDs for sessions in the session store, assuming that the store is empty
+persistentManager.storeLoadError=Error swapping in sessions from the store
+persistentManager.storeLoadKeysError=Error loading sessions keys from the store
 persistentManager.storeSizeException=Unable to determine the number of 
sessions in the session store, assuming that the store is empty
 persistentManager.swapIn=Swapping session [{0}] in from Store
 persistentManager.swapInException=Exception in the Store during swapIn: [{0}]

Modified: 
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=1848329&r1=1848328&r2=1848329&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java 
Thu Dec  6 15:04:24 2018
@@ -307,14 +307,15 @@ public abstract class PersistentManagerB
  *
  * @param id The session id for the session to be searched for
  * @return {@code true}, if the session id is loaded in memory
- * otherwise {@code false} is returned
+ *  otherwise {@code false} is returned
  */
-public boolean isLoaded( String id ){
+public boolean isLoaded(String id){
 try {
-if ( super.findSession(id) != null )
+if (super.findSession(id) != null) {
 return true;
+}
 } catch (IOException e) {
-log.error("checking isLoaded for id, " + id + ", "+e.getMessage(), 
e);
+log.error(sm.getString("persistentManager.isLoadedError", id), e);
 }
 return false;
 }
@@ -397,19 +398,17 @@ public abstract class PersistentManagerB
 return;
 
 try {
-if (SecurityUtil.isPackageProtectionEnabled()){
-try{
+if (SecurityUtil.isPackageProtectionEnabled()) {
+try {
 AccessController.doPrivileged(new PrivilegedStoreClear());
-}catch(PrivilegedActionException ex){
-Exception exception = ex.getException();
-log.error("Exception clearing the Store: " + exception,
-exception);
+} catch (PrivilegedActionException e) {
+
log.error(sm.getString("persistentManager.storeClearError"), e.getException());
 }
 } else {
 store.clear();
 }
 } catch (IOException e) {
-log.error("Exception clearing the Store: " + e, e);
+log.error(sm.getString("persistentManager.storeClearError"), e);
 }
 
 }
@@ -527,21 +526,19 @@ public abstract class PersistentManagerB
 
 String[] ids = null;
 try {
-if (SecurityUtil.isPackageProtectionEnabled()){
-try{
-ids = AccessController.doPrivileged(
-new PrivilegedStoreKeys());
-}catch(PrivilegedActionException ex){
-Exception exception = ex.getException();
-log.error("Exception in the Store during load: "
-  + exception, exception);
+if (SecurityUtil.isPackageProtectionEnabled()) {
+try {
+

svn commit: r1848330 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 15:05:38 2018
New Revision: 1848330

URL: http://svn.apache.org/viewvc?rev=1848330&view=rev
Log:
Refactor the code that performs class scanning during web application start to 
make integration simpler for downstream users.
Patch provided by rmannibucau.

Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1848330&r1=1848329&r2=1848330&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Thu Dec  6 
15:05:38 2018
@@ -1132,36 +1132,8 @@ public class ContextConfig implements Li
 }
 
 if  (!webXml.isMetadataComplete() || typeInitializerMap.size() > 0) {
-// Step 4. Process /WEB-INF/classes for annotations and
-// @HandlesTypes matches
-Map javaClassCache = new HashMap<>();
-
-if (ok) {
-WebResource[] webResources =
-
context.getResources().listResources("/WEB-INF/classes");
-
-for (WebResource webResource : webResources) {
-// Skip the META-INF directory from any JARs that have been
-// expanded in to WEB-INF/classes (sometimes IDEs do this).
-if ("META-INF".equals(webResource.getName())) {
-continue;
-}
-processAnnotationsWebResource(webResource, webXml,
-webXml.isMetadataComplete(), javaClassCache);
-}
-}
-
-// Step 5. Process JARs for annotations and
-// @HandlesTypes matches - only need to process those fragments we
-// are going to use (remember orderedFragments includes any
-// container fragments)
-if (ok) {
-processAnnotations(
-orderedFragments, webXml.isMetadataComplete(), 
javaClassCache);
-}
-
-// Cache, if used, is no longer required so clear it
-javaClassCache.clear();
+// Steps 4 & 5.
+processClasses(webXml, orderedFragments);
 }
 
 if (!webXml.isMetadataComplete()) {
@@ -1237,6 +1209,40 @@ public class ContextConfig implements Li
 }
 
 
+protected void processClasses(WebXml webXml, Set orderedFragments) 
{
+// Step 4. Process /WEB-INF/classes for annotations and
+// @HandlesTypes matches
+Map javaClassCache = new HashMap<>();
+
+if (ok) {
+WebResource[] webResources =
+context.getResources().listResources("/WEB-INF/classes");
+
+for (WebResource webResource : webResources) {
+// Skip the META-INF directory from any JARs that have been
+// expanded in to WEB-INF/classes (sometimes IDEs do this).
+if ("META-INF".equals(webResource.getName())) {
+continue;
+}
+processAnnotationsWebResource(webResource, webXml,
+webXml.isMetadataComplete(), javaClassCache);
+}
+}
+
+// Step 5. Process JARs for annotations and
+// @HandlesTypes matches - only need to process those fragments we
+// are going to use (remember orderedFragments includes any
+// container fragments)
+if (ok) {
+processAnnotations(
+orderedFragments, webXml.isMetadataComplete(), 
javaClassCache);
+}
+
+// Cache, if used, is no longer required so clear it
+javaClassCache.clear();
+}
+
+
 private void configureContext(WebXml webxml) {
 // As far as possible, process in alphabetical order so it is easy to
 // check everything is present
@@ -2109,6 +2115,11 @@ public class ContextConfig implements Li
 return;
 }
 
+processClass(fragment, clazz);
+}
+
+
+protected void processClass(WebXml fragment, JavaClass clazz) {
 AnnotationEntry[] annotationsEntries = clazz.getAnnotationEntries();
 if (annotationsEntries != null) {
 String className = clazz.getClassName();
@@ -2127,6 +2138,7 @@ public class ContextConfig implements Li
 }
 }
 
+
 /**
  * For classes packaged with the web application, the class and each
  * super class needs to be checked for a match with {@link HandlesTypes} or

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1848330&r1=1848329&r2=1848330&view=diff
==

svn commit: r1848331 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 15:07:43 2018
New Revision: 1848331

URL: http://svn.apache.org/viewvc?rev=1848331&view=rev
Log:
Refactor the code that performs class scanning during web application start to 
make integration simpler for downstream users.
Patch provided by rmannibucau.

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

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  6 15:07:43 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-17633

svn commit: r1848332 - /tomcat/trunk/webapps/docs/changelog.xml

2018-12-06 Thread remm

Author: remm
Date: Thu Dec  6 15:14:54 2018
New Revision: 1848332

URL: http://svn.apache.org/viewvc?rev=1848332&view=rev
Log:
Changelog update

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

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1848332&r1=1848331&r2=1848332&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Dec  6 15:14:54 2018
@@ -129,6 +129,10 @@
 web application start to make integration simpler for downstream users.
 Patch provided by rmannibucau. (markt)
   
+  
+Filter out tomcat-web.xml from the watched resources list in
+storeconfig. (remm)
+  
 
   
   
@@ -283,6 +287,9 @@
 pick up the latest Windows binaries built with APR 1.6.5 and OpenSSL
 1.1.1a. (markt)
   
+  
+Add i18n to many strings that lacked it. (remm)
+  
 
   
 



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

svn commit: r1848333 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 15:18:07 2018
New Revision: 1848333

URL: http://svn.apache.org/viewvc?rev=1848333&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62986
Refactor the code that performs class scanning during web application start to 
make integration simpler for downstream users.
Based on a patch provided by rmannibucau.

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/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  6 15:18:07 2018
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957

[Bug 62988] New: LoadBalancerDrainingValve only works with uncommon webapp configuration

2018-12-06 Thread bugzilla

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

Bug ID: 62988
   Summary: LoadBalancerDrainingValve only works with uncommon
webapp configuration
   Product: Tomcat 9
   Version: 9.0.13
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: apa...@akurth.de
  Target Milestone: -

Created attachment 36298
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=36298&action=edit
Patch for LoadBalancerDrainingValve (see bug description)

After configuring LoadBalancerDrainingValve in order to force redirects when
mod_jk would route to a DISABLED node we encountered the following bugs:

1)
NullPointerException when the


  
JSESSIONID
  


 element would not be present in web.xml. It cannot be expected and is in
fact highly unlikely that web applications override the default value
"JSESSIONID" in this element.

2)
The removal of a session cookie before redirection does only work when the
Context attribute sessionCookiePathUsesTrailingSlash has been set to true,
which is also a rather uncommon configuration setting. Failing to remove the
session cookie leads to redirection loop. The bug results from the fact that
the respective code block is wrongly parenthesized, and can easily be fixed by
moving the code block out of the surrounding if statement.

3)
Determination of the session cookie path is incomplete.

I added a patch (trunk) with fixes for these bugs, which also addresses the
following minor issues:

- Remove obsolete get methods for configuration parameters
- Remove Javadoc which states that a request parameter will be added to
redirect URIs, which is not the case
- Add missing parentheses

-- 
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 62986] Enable to override ContextConfig.webConfig class scanning

2018-12-06 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #2 from Mark Thomas  ---
Thanks for the patch. Looks like a reasonable request to me.

Fixed in:
- trunk for 9.0.14 onwards
- 8.5.x for 8.5.36 onwards
- 7.0.x for 7.0.93 onwards

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot success in on tomcat-85-trunk

2018-12-06 Thread buildbot

The Buildbot has detected a restored build on builder tomcat-85-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-85-trunk/builds/1571

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.5.x/trunk] 1848325
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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

[ANN] Apache Tomcat Native 1.2.19 released

2018-12-06 Thread Mark Thomas

The Apache Tomcat team announces the immediate availability of Apache
Tomcat Native 1.2.19 stable.

The key features of this release are:
- Fixed memory leaks when using OCSP checks
- Windows binaries built with APR 1.6.5 and OpenSSL 1.1.1.a
- Windows binaries built with APR 1.6.5 and OpenSSL 1.0.2q

Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/native-doc/miscellaneous/changelog.html

Downloads:
http://tomcat.apache.org/download-native.cgi

The Apache Tomcat Native Library provides portable API for features
not found in contemporary JDK's. It uses Apache Portable Runtime as
operating system abstraction layer and OpenSSL for SSL networking and
allows optimal performance in production environments.

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

[GUMP@vmgump-vm3]: Project tomcat-native-trunk-make (in module tomcat-native-trunk) failed

2018-12-06 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-native-trunk-make has an issue affecting its community 
integration.
This issue affects 3 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-native-trunk-make :  Tomcat native library using Apache Portable 
Runtime
- tomcat-native-trunk-make-install :  Tomcat native library using Apache 
Portable Runtime
- tomcat-trunk-test-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump-vm3.apache.org/tomcat-native-trunk/tomcat-native-trunk-make/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-native-trunk/tomcat-native-trunk-make/gump_work/build_tomcat-native-trunk_tomcat-native-trunk-make.html
Work Name: build_tomcat-native-trunk_tomcat-native-trunk-make (Type: Build)
Work ended in a state of : Failed
Elapsed: 8 secs
Command Line: make 
[Working Directory: /srv/gump/public/workspace/tomcat-native-trunk/native]
-
 ^
src/ssl.c: In function 'Java_org_apache_tomcat_jni_SSL_initialize':
/srv/gump/public/workspace/openssl-master/dest-20181206/include/openssl/opensslv.h:134:11:
 error: missing binary operator before token "("
 (long)( (OPENSSL_VERSION_MAJOR<<28)  \
   ^
src/ssl.c:741:36: note: in expansion of macro 'OPENSSL_VERSION_NUMBER'
 #if !defined(OPENSSL_NO_ENGINE) || OPENSSL_VERSION_NUMBER < 0x1010L
    ^
/srv/gump/public/workspace/openssl-master/dest-20181206/include/openssl/opensslv.h:134:11:
 error: missing binary operator before token "("
 (long)( (OPENSSL_VERSION_MAJOR<<28)  \
   ^
src/ssl.c:772:5: note: in expansion of macro 'OPENSSL_VERSION_NUMBER'
 #if OPENSSL_VERSION_NUMBER < 0x1010L
 ^
src/ssl.c:796:17: error: 'err' undeclared (first use in this function)
 err = APR_ENOTIMPL;
 ^
src/ssl.c:796:17: note: each undeclared identifier is reported only once for 
each function it appears in
In file included from ./include/ssl_private.h:37:0,
 from src/ssl.c:28:
/srv/gump/public/workspace/openssl-master/dest-20181206/include/openssl/opensslv.h:134:11:
 error: missing binary operator before token "("
 (long)( (OPENSSL_VERSION_MAJOR<<28)  \
   ^
src/ssl.c:829:5: note: in expansion of macro 'OPENSSL_VERSION_NUMBER'
 #if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
 ^
src/ssl.c: In function 'jbs_new':
/srv/gump/public/workspace/openssl-master/dest-20181206/include/openssl/opensslv.h:134:11:
 error: missing binary operator before token "("
 (long)( (OPENSSL_VERSION_MAJOR<<28)  \
   ^
src/ssl.c:991:5: note: in expansion of macro 'OPENSSL_VERSION_NUMBER'
 #if OPENSSL_VERSION_NUMBER < 0x1010L
 ^
src/ssl.c: At top level:
/srv/gump/public/workspace/openssl-master/dest-20181206/include/openssl/opensslv.h:134:11:
 error: missing binary operator before token "("
 (long)( (OPENSSL_VERSION_MAJOR<<28)  \
   ^
src/ssl.c:1127:5: note: in expansion of macro 'OPENSSL_VERSION_NUMBER'
 #if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
 ^
src/ssl.c: In function 'BIO_jbs':
/srv/gump/public/workspace/openssl-master/dest-20181206/include/openssl/opensslv.h:134:11:
 error: missing binary operator before token "("
 (long)( (OPENSSL_VERSION_MAJOR<<28)  \
   ^
src/ssl.c:1163:5: note: in expansion of macro 'OPENSSL_VERSION_NUMBER'
 #if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
 ^
make[1]: *** [src/ssl.lo] Error 1
make[1]: Leaving directory 
`/srv/gump/public/workspace/tomcat-native-trunk/native'
make: *** [all-recursive] Error 1
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump-vm3.apache.org/tomcat-native-trunk/tomcat-native-trunk-make/rss.xml
- Atom: 
http://vmgump-vm3.apache.org/tomcat-native-trunk/tomcat-native-trunk-make/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 20181206180006, vmgump-vm3.apache.org:vmgump:20181206180006
Gump E-mail Identifier (unique within run) #1.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump-vm3]

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

svn commit: r1848347 - in /tomcat/trunk/java/org/apache/catalina: core/ApplicationSessionCookieConfig.java util/SessionConfig.java

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 18:55:23 2018
New Revision: 1848347

URL: http://svn.apache.org/viewvc?rev=1848347&view=rev
Log:
Refactor with an eye to fixing BZ 62988 that also needs to determine the 
session cookie path from the Context.

Modified:

tomcat/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java
tomcat/trunk/java/org/apache/catalina/util/SessionConfig.java

Modified: 
tomcat/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java?rev=1848347&r1=1848346&r2=1848347&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java 
Thu Dec  6 18:55:23 2018
@@ -197,29 +197,7 @@ public class ApplicationSessionCookieCon
 cookie.setHttpOnly(true);
 }
 
-String contextPath = context.getSessionCookiePath();
-if (contextPath == null || contextPath.length() == 0) {
-contextPath = scc.getPath();
-}
-if (contextPath == null || contextPath.length() == 0) {
-contextPath = context.getEncodedPath();
-}
-if (context.getSessionCookiePathUsesTrailingSlash()) {
-// Handle special case of ROOT context where cookies require a 
path of
-// '/' but the servlet spec uses an empty string
-// Also ensure the cookies for a context with a path of /foo don't 
get
-// sent for requests with a path of /foobar
-if (!contextPath.endsWith("/")) {
-contextPath = contextPath + "/";
-}
-} else {
-// Only handle special case of ROOT context where cookies require a
-// path of '/' but the servlet spec uses an empty string
-if (contextPath.length() == 0) {
-contextPath = "/";
-}
-}
-cookie.setPath(contextPath);
+cookie.setPath(SessionConfig.getSessionCookiePath(context));
 
 return cookie;
 }

Modified: tomcat/trunk/java/org/apache/catalina/util/SessionConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/SessionConfig.java?rev=1848347&r1=1848346&r2=1848347&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/SessionConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/SessionConfig.java Thu Dec  6 
18:55:23 2018
@@ -84,6 +84,44 @@ public class SessionConfig {
 }
 
 
+/**
+ * Determine the value to use for the session cookie path for the provided
+ * context.
+ *
+ * @param context The context
+ * @return the parameter name for the session
+ */
+public static String getSessionCookiePath(Context context) {
+
+SessionCookieConfig scc = 
context.getServletContext().getSessionCookieConfig();
+
+String contextPath = context.getSessionCookiePath();
+if (contextPath == null || contextPath.length() == 0) {
+contextPath = scc.getPath();
+}
+if (contextPath == null || contextPath.length() == 0) {
+contextPath = context.getEncodedPath();
+}
+if (context.getSessionCookiePathUsesTrailingSlash()) {
+// Handle special case of ROOT context where cookies require a 
path of
+// '/' but the servlet spec uses an empty string
+// Also ensure the cookies for a context with a path of /foo don't 
get
+// sent for requests with a path of /foobar
+if (!contextPath.endsWith("/")) {
+contextPath = contextPath + "/";
+}
+} else {
+// Only handle special case of ROOT context where cookies require a
+// path of '/' but the servlet spec uses an empty string
+if (contextPath.length() == 0) {
+contextPath = "/";
+}
+}
+
+return contextPath;
+}
+
+
 private SessionConfig() {
 // Utility class. Hide default constructor.
 }



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

svn commit: r1848348 - in /tomcat/trunk: java/org/apache/catalina/valves/LoadBalancerDrainingValve.java test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java webapps/docs/changelog.xml

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 19:10:36 2018
New Revision: 1848348

URL: http://svn.apache.org/viewvc?rev=1848348&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62988
Fix the LoadBalancerDrainingValve so it works when the session cookie 
configuration is not explicitly declared.
Based on a patch provided by Andreas Kurth.

Modified:
tomcat/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java

tomcat/trunk/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java?rev=1848348&r1=1848347&r2=1848348&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java 
Thu Dec  6 19:10:36 2018
@@ -36,9 +36,6 @@ import org.apache.catalina.util.SessionC
  * and the client should be redirected to the same URI. This will cause the
  * load-balanced to re-balance the client to another server.
  *
- * A request parameter is added to the redirect URI in order to avoid
- * repeated redirects in the event of an error or misconfiguration.
- *
  * All this work is required because when the activation state of a node is
  * DISABLED, the load-balancer will still send requests to the node if they
  * appear to have a session on that node. Since mod_jk doesn't actually know
@@ -59,9 +56,8 @@ import org.apache.catalina.util.SessionC
  * @see https://tomcat.apache.org/connectors-doc/generic_howto/loadbalancers.html";>Load
  *  balancer documentation
  */
-public class LoadBalancerDrainingValve
-extends ValveBase
-{
+public class LoadBalancerDrainingValve extends ValveBase {
+
 /**
  * The request attribute key where the load-balancer's activation state
  * can be found.
@@ -90,7 +86,7 @@ public class LoadBalancerDrainingValve
  * The value of the cookie which can be set to ignore the "draining" action
  * of this Filter. This will allow a client to contact the server without
  * being re-balanced to another server. The expected cookie name can be set
- * in the {@link #_ignoreCookieValue}. The cookie name and value must match
+ * in the {@link #_ignoreCookieName}. The cookie name and value must match
  * to avoid being re-balanced.
  */
 private String _ignoreCookieValue;
@@ -175,45 +171,45 @@ public class LoadBalancerDrainingValve
 
 @Override
 public void invoke(Request request, Response response) throws IOException, 
ServletException {
-if("DIS".equals(request.getAttribute(ATTRIBUTE_KEY_JK_LB_ACTIVATION))
-   && !request.isRequestedSessionIdValid()) {
+if  
("DIS".equals(request.getAttribute(ATTRIBUTE_KEY_JK_LB_ACTIVATION)) &&
+!request.isRequestedSessionIdValid()) {
 
-if(containerLog.isDebugEnabled())
+if (containerLog.isDebugEnabled()) {
 containerLog.debug("Load-balancer is in DISABLED state; 
draining this node");
+}
 
-boolean ignoreRebalance = false; // Allow certain clients
+boolean ignoreRebalance = false;
 Cookie sessionCookie = null;
 
-// Kill any session cookie present
 final Cookie[] cookies = request.getCookies();
 
-final String sessionCookieName = 
request.getServletContext().getSessionCookieConfig().getName();
+final String sessionCookieName = 
SessionConfig.getSessionCookieName(request.getContext());
 
-// Kill any session cookie present
-if(null != cookies) {
-for(Cookie cookie : cookies) {
+if (null != cookies) {
+for (Cookie cookie : cookies) {
 final String cookieName = cookie.getName();
-if(containerLog.isTraceEnabled())
+if (containerLog.isTraceEnabled()) {
 containerLog.trace("Checking cookie " + cookieName + 
"=" + cookie.getValue());
+}
 
-if(sessionCookieName.equals(cookieName)
-   && 
request.getRequestedSessionId().equals(cookie.getValue())) {
+if (sessionCookieName.equals(cookieName) &&
+
request.getRequestedSessionId().equals(cookie.getValue())) {
 sessionCookie = cookie;
-} else
-// Is the client presenting a valid ignore-cookie value?
-if(null != _ignoreCookieName
-&& _ignoreCookieName.equals(cookieName)
-&& null != _ignoreCookieValue
-&& _ignoreCookieValue.equa

svn commit: r1848349 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/ApplicationSessionCookieConfig.java java/org/apache/catalina/util/SessionConfig.java

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 19:19:17 2018
New Revision: 1848349

URL: http://svn.apache.org/viewvc?rev=1848349&view=rev
Log:
Refactor with an eye to fixing BZ 62988 that also needs to determine the 
session cookie path from the Context.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)

tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/SessionConfig.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  6 19:19:17 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,176337

svn commit: r1848350 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/valves/LoadBalancerDrainingValve.java test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java webapps/docs/chang

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 19:20:16 2018
New Revision: 1848350

URL: http://svn.apache.org/viewvc?rev=1848350&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62988
Fix the LoadBalancerDrainingValve so it works when the session cookie 
configuration is not explicitly declared.
Based on a patch provided by Andreas Kurth.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)

tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  6 19:20:16 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762

[Bug 62988] LoadBalancerDrainingValve only works with uncommon webapp configuration

2018-12-06 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Mark Thomas  ---
Thanks for the report and the patch.

Working my way through the patch I agree with nearly all of these changes with
a couple of minor observations
- The getters are not obsolete. They are used by JMX so they need to stay
- I did the necessary refactoring to remove the code duplication.

Fixed in:
- trunk for 9.0.14 onwards
- 8.5.x for 8.5.36 onwards

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot failure in on tomcat-trunk

2018-12-06 Thread buildbot

The Buildbot has detected a new failure on builder tomcat-trunk while building 
. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/3852

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1848348
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

svn commit: r1848351 - in /tomcat/trunk/java/org/apache/catalina: connector/ filters/ manager/ servlets/ tribes/group/ tribes/group/interceptors/ tribes/transport/nio/ webresources/

2018-12-06 Thread remm

Author: remm
Date: Thu Dec  6 19:45:54 2018
New Revision: 1848351

URL: http://svn.apache.org/viewvc?rev=1848351&view=rev
Log:
Add i18n for more package.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java

tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1848351&r1=1848350&r2=1848351&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Thu Dec  
6 19:45:54 2018
@@ -133,7 +133,7 @@ public class CoyoteAdapter implements Ad
 Response response = (Response) res.getNote(ADAPTER_NOTES);
 
 if (request == null) {
-throw new IllegalStateException("Dispatch may only happen on an 
existing request.");
+throw new 
IllegalStateException(sm.getString("coyoteAdapter.nullRequest"));
 }
 
 boolean success = true;

Modified: 
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1848351&r1=1848350&r2=1848351&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties 
[UTF-8] Thu Dec  6 19:45:54 2018
@@ -20,6 +20,7 @@ coyoteAdapter.authorize=Authorizing user
 coyoteAdapter.checkRecycled.request=Encountered a non-recycled request and 
recycled it forcedly.
 coyoteAdapter.checkRecycled.response=Encountered a non-recycled response and 
recycled it forcedly.
 coyoteAdapter.debug=The variable [{0}] has value [{1}]
+coyoteAdapter.nullRequest=An asynchronous dispatch may only happen on an 
existing request
 coyoteAdapter.parsePathParam=Unable to parse the path parameters using 
encoding [{0}]. The path parameters in the URL will be ignored.
 
 coyoteConnector.invalidEncoding=The encoding [{0}] is not recognised by the 
JRE. The Connector will continue to use [{1}]

Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1848351&r1=1848350&r2=1848351&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Thu Dec  6 
19:45:54 2018
@@ -1021,7 +1021,6 @@ public class ExpiresFilter extends Filte
  */
 @Override
 public boolean isReady() {
-// TODO Auto-generated method stub
 return false;
 }
 
@@ -1030,12 +1029,8 @@ public class ExpiresFilter extends Filte
  */
 @Override
 public void setWriteListener(WriteListener listener) {
-// TODO Auto-generated method stub
-
 }
 
-
-
 }
 
 /**
@@ -1076,9 +1071,7 @@ public class ExpiresFilter extends Filte
 try {
 ints[i] = Integer.parseInt(intAsString);
 } catch (NumberFormatException e) {
-throw new RuntimeException("Exception parsing number '" + i +
-"' (zero based) of comma delimited list '" +
-commaDelimitedInts + "'");
+throw new 
RuntimeException(sm.getString("expiresFilter.numberError", i, 
commaD

svn commit: r1848354 - in /tomcat/trunk/java/org/apache/catalina: loader/ realm/ startup/ storeconfig/ valves/ valves/rewrite/

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 20:03:05 2018
New Revision: 1848354

URL: http://svn.apache.org/viewvc?rev=1848354&view=rev
Log:
Sync French translations with POEditor

Added:

tomcat/trunk/java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties 
  (with props)
Modified:
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties?rev=1848354&r1=1848353&r2=1848354&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties 
[UTF-8] Thu Dec  6 20:03:05 2018
@@ -46,6 +46,8 @@ webappClassLoader.loadedByThisOrChildFai
 webappClassLoader.readError=Erreur lors de la lecture de la resource : 
impossible de charger [{0}].
 webappClassLoader.removeTransformer=Enlevé le transformateur de fichiers de 
classe [{0}] de l''application web [{1}]
 webappClassLoader.resourceModified=La ressource [{0}] a été modifiée, la date 
de dernière modification était [{1}] et est désormais [{2}]
+webappClassLoader.restrictedPackage=Violation de sécurité en essayant 
d''utiliser à une classe à accès restreint [{0}]
+webappClassLoader.securityException=Exception de sécurité en essayant de 
trouver la classe [{0}] dans findClassInternal [{1}]
 webappClassLoader.stackTrace=L''application web [{0}] semble avoir démarré un 
thread nommé [{1}] mais ne l''a pas arrêté, ce qui va probablement créer une 
fuite de mémoire; la trace du thread est: {2}
 webappClassLoader.stackTraceRequestThread=Une requête de l''application web 
[{0}] est toujours en cours, ce qui causera certainement une fuite de mémoire, 
vous pouvez contrôler le temps alloué en utilisant l''attribut unloadDelay de 
l''implémentation standard de Context; trace du fil d’exécution de la requête: 
[{2}]
 webappClassLoader.stopThreadFail=Impossible de terminer le thread nommé [{0}] 
pour l''application [{1}]
@@ -64,8 +66,12 @@ webappLoader.copyFailure=Echec lors de l
 webappLoader.deploy=Déploiement des classes des réceptacles (class 
repositories) vers le répertoire de travail [{0}]
 webappLoader.jarDeploy=Déploiement du JAR [{0}] vers [{1}]
 webappLoader.mkdirFailure=Impossible de créer le répertoire de destination 
pour copier les ressources
+webappLoader.noResources=Pas de ressources trouvées pour le contexte [{0}]
 webappLoader.readFailure=Impossible de lire la ressource [{0}]
 webappLoader.reloadable=Impossible de mettre la propriété rechargeable à [{0}]
 webappLoader.setContext.ise=Il est interdit de définir le Context lorsque le 
chargeur de classes a déjà été démarré
+webappLoader.startError=Erreur lors du démarrage du chargeur
 webappLoader.starting=Démarrage de ce chargeur (loader)
+webappLoader.stopError=Erreur lors de l'arrêt du chargeur
 webappLoader.stopping=Arrêt de ce chargeur (loader)
+webappLoader.unknownClassLoader=Le chargeur de classes [{0}] de la classe 
[{1}] est inconnu

Modified: tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_fr.properties?rev=1848354&r1=1848353&r2=1848354&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_fr.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_fr.properties 
[UTF-8] Thu Dec  6 20:03:05 2018
@@ -34,7 +34,16 @@ dataSourceRealm.getRoles.exception=Excep
 
 jaasCallback.username=Nom d''utilisateur renvoyé [{0}]
 
+jaasMemoryLoginModule.callbackHandlerError=Erreur lors de l''invocation du 
CallbackHandler: [{0}]
+jaasMemoryLoginModule.invalidCredentials=Le nom d'utilisateur ou le mot de 
passe est incorrect
+jaasMemoryLoginModule.noCallbackHandler=Aucun CallbackHandler n'a été spécifié
+jaasMemoryLoginModule.noCatalinaBase=Impossible de déterminer le répertoire de 
base de Catalina pour pouvoir charger le fichier [{0}]
+jaasMemoryLoginModule.noConfig=Impossible de charger le fichier de 
configuration [{0}]
+jaasMemoryLoginModule.parseError=Erreur de traitement du fichier de 
configuration [{0}]
+jaasMemoryLoginModule.unknownAuthenticationMethod=Méthode d'authentification 
inconnue
+
 jaasRealm.accountExpired=le nom d''utilisateur [{0}] N''A PAS été authentifié 
car le compte a expiré
+jaasRealm.appName=Définition du nom d''application JAAS comme [{0}]
 jaasRealm.

svn commit: r1848355 - in /tomcat/trunk/java/org/apache/catalina: loader/LocalStrings_ja.properties realm/LocalStrings_ja.properties storeconfig/LocalStrings_ja.properties

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 20:04:18 2018
New Revision: 1848355

URL: http://svn.apache.org/viewvc?rev=1848355&view=rev
Log:
Sync Japanese translations with POEditor

Modified:
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings_ja.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_ja.properties?rev=1848355&r1=1848354&r2=1848355&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_ja.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_ja.properties 
[UTF-8] Thu Dec  6 20:04:18 2018
@@ -28,5 +28,6 @@ webappLoader.deploy=クラスリポジ�
 webappLoader.jarDeploy=JAR [{0}] を [{1}] に配備します
 webappLoader.reloadable=reloadableプロパティを [{0}] に設定できません
 webappLoader.setContext.ise=クラスローダーが開始したあとは Context を構成することはできません。
+webappLoader.startError=クラスローダーの開始時に異常が発生しました。
 webappLoader.starting=このローダを起動します
 webappLoader.stopping=このローダを停止します

Modified: tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_ja.properties?rev=1848355&r1=1848354&r2=1848355&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_ja.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_ja.properties 
[UTF-8] Thu Dec  6 20:04:18 2018
@@ -23,6 +23,9 @@ dataSourceRealm.exception=認証を実�
 dataSourceRealm.getPassword.exception=[{0}] のパスワードを取得中に異常が発生しました。
 dataSourceRealm.getRoles.exception=[{0}] のロールを取得する途中で例外が発生しました。
 
+jaasMemoryLoginModule.invalidCredentials=ユーザー名、または、パスワードが一致しません。
+jaasMemoryLoginModule.noConfig=設定ファイルを読み込めませんでした。 [{0}]
+
 jaasRealm.accountExpired=ユーザ名 [{0}] はアカウントの期限が切れているために認証されません
 jaasRealm.authenticateSuccess=ユーザ名 [{0}] は認証に成功しました
 jaasRealm.credentialExpired=ユーザ名 [{0}] は証明書の期限が切れたために認証されません

Modified: 
tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings_ja.properties?rev=1848355&r1=1848354&r2=1848355&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings_ja.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings_ja.properties 
Thu Dec  6 20:04:18 2018
@@ -21,3 +21,5 @@ registry.loadClassFailed=ã¯ã©ã�
 
 storeConfigListener.loadError=StoreConfigã®èªã¿è¾¼ã¿ã¨ã©ã¼
 storeConfigListener.registerError=StoreConfig 
MBeanã®ç»é²ä¸ã«ã¨ã©ã¼ãçºçãã¾ãã
+
+storeFileMover.directoryCreationError=ãã£ã¬ã¯ããªãä½æã§ãã¾ããã[{0}]



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

svn commit: r1848356 - in /tomcat/trunk/java/org/apache: catalina/core/LocalStrings_de.properties catalina/startup/LocalStrings_zh_CN.properties tomcat/util/http/LocalStrings_ko.properties

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 20:07:28 2018
New Revision: 1848356

URL: http://svn.apache.org/viewvc?rev=1848356&view=rev
Log:
Fix escaping of single quotes (not sure yet why it keeps breaking)

Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_ko.properties

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_de.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_de.properties?rev=1848356&r1=1848355&r2=1848356&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_de.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_de.properties Thu 
Dec  6 20:07:28 2018
@@ -31,8 +31,8 @@ naming.wsdlFailed=Die WSDL Datei [{0}] w
 
 standardContext.isUnavailable=Die Anwendung ist derzeit nicht verfÃ¼gbar
 standardContext.listenerStart=Fehler beim Senden der ''Context Initialized'' 
Benachrichtigung an den Listener aus der Klasse [{0}]
-standardContext.loginConfig.errorPage=Formularfehlerseite [{0}] muss mit einem 
''/' beginnen
-standardContext.loginConfig.errorWarning=WARNING: Form Fehler Seite [{0}] muss 
bei Servlet 2.4 mit einem ''/' starten
+standardContext.loginConfig.errorPage=Formularfehlerseite [{0}] muss mit einem 
''/'' beginnen
+standardContext.loginConfig.errorWarning=WARNING: Form Fehler Seite [{0}] muss 
bei Servlet 2.4 mit einem ''/'' starten
 standardContext.notStarted=Context mit Name [{0}] wurde noch nicht gestartet
 standardContext.securityConstraint.mixHttpMethod= und 
 dÃ¼rfen nicht in derselben Web-Ressource-Kollektion 
verwendet werden
 standardContext.securityConstraint.pattern=UngÃ¼ltiges  [{0}] im 
Security Constraint

Modified: 
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties?rev=1848356&r1=1848355&r2=1848356&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties 
Thu Dec  6 20:07:28 2018
@@ -32,7 +32,7 @@ contextConfig.defaultPosition=åç
 contextConfig.fixDocBase=ä¸ä¸æ[{0}]çå¼å¸¸ä¿®å¤docBase
 contextConfig.init=ä¸ä¸æéç½®: æ£å¨åå§å
 contextConfig.inputStreamWebResource=ä¸è½å¤çæ³¨éçWebèµæº[{0}]
-contextConfig.jspFile.error=JSPæä»¶[{0}]å¿é¡»ä»¥''/'å¼å¤´ã
+contextConfig.jspFile.error=JSPæä»¶[{0}]å¿é¡»ä»¥''/''å¼å¤´ã
 contextConfig.processAnnotationsDir.debug=ä½¿ç¨æ³¨è§£ 
[{0}]æ«æç®å½ä¸çç±»æä»¶
 contextConfig.processAnnotationsWebDir.debug=æ«æ web 
åºç¨ç¨åºç®å½ä¸å«æ [{0}] æ³¨è§£ç class æä»¶
 contextConfig.role.runas= ä¸ä½¿ç¨çå®å¨è§è²å [{0}]ï¼æªå¨ 
 ä¸å®ä¹

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_ko.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_ko.properties?rev=1848356&r1=1848355&r2=1848356&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_ko.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_ko.properties 
Thu Dec  6 20:07:28 2018
@@ -24,6 +24,6 @@ parameters.fallToDebug=Note: Parameter �
 parameters.maxCountFail=ë¨ì¼ request ([{0}])ì(ë¥¼) ìí´ ìµë íì© 
request íë¼ë¯¸í°ë¤ë³´ë¤ ë ë§ì íë¼ë¯¸í°ë¤ì´ 
íì§ëììµëë¤. ì´ íê³ê°ì ì´ê³¼íë íë¼ë¯¸í°ë¤ì 
ë¬´ìëììµëë¤. ì´ íê³ê°ì ë³ê²½íê¸° ìí´ìë Connectorì 
maxParameterCount ìì±ì ì¤ì íììì¤.
 parameters.maxCountFail.fallToDebug=\n\
 ë¹ê³ : ì´ ì¤ë¥ê° ë ì´ì ë°ìíë ê²ë¤ì ëí´ìë DEBUG ë 
ë²¨ë¡ ë¡ê·¸ì ê¸°ë¡ë  ê²ìëë¤.
-parameters.noequal=[{0}] ìì¹ìì ììíê³  [{1}] ìì¹ìì 
ëëë©° ê°ì´ [{2}]ì¸ íë¼ë¯¸í° ë¤ìì ''=' ë¬¸ìê° ë¤ë°ë¥´ì§ 
ììµëë¤.
+parameters.noequal=[{0}] ìì¹ìì ììíê³  [{1}] ìì¹ìì 
ëëë©° ê°ì´ [{2}]ì¸ íë¼ë¯¸í° ë¤ìì ''='' ë¬¸ìê° ë¤ë°ë¥´ì§ 
ììµëë¤.
 
 rfc6265CookieProcessor.invalidPath=ì´ ì¿ í¤ë¥¼ ìí´ ì í¨íì§ ìì 
ê²½ë¡ê° ì¤ì ëììµëë¤: [{0}]



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

buildbot success in on tomcat-trunk

2018-12-06 Thread buildbot

The Buildbot has detected a restored build on builder tomcat-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/3853

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1848351
Blamelist: remm

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1848362 - in /tomcat/native/trunk: build.properties.default native/include/tcn_version.h native/os/win32/libtcnative.rc xdocs/miscellaneous/changelog.xml

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 20:38:12 2018
New Revision: 1848362

URL: http://svn.apache.org/viewvc?rev=1848362&view=rev
Log:
Increment version info ready for next development cycle

Modified:
tomcat/native/trunk/build.properties.default
tomcat/native/trunk/native/include/tcn_version.h
tomcat/native/trunk/native/os/win32/libtcnative.rc
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/native/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/build.properties.default?rev=1848362&r1=1848361&r2=1848362&view=diff
==
--- tomcat/native/trunk/build.properties.default (original)
+++ tomcat/native/trunk/build.properties.default Thu Dec  6 20:38:12 2018
@@ -18,7 +18,7 @@
 # - Version Control Flags -
 version.major=1
 version.minor=2
-version.build=19
+version.build=20
 version.patch=0
 version.suffix=-dev
 

Modified: tomcat/native/trunk/native/include/tcn_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/tcn_version.h?rev=1848362&r1=1848361&r2=1848362&view=diff
==
--- tomcat/native/trunk/native/include/tcn_version.h (original)
+++ tomcat/native/trunk/native/include/tcn_version.h Thu Dec  6 20:38:12 2018
@@ -63,7 +63,7 @@ extern "C" {
 #define TCN_MINOR_VERSION   2
 
 /** patch level */
-#define TCN_PATCH_VERSION   19
+#define TCN_PATCH_VERSION   20
 
 /**
  *  This symbol is defined for internal, "development" copies of TCN. This

Modified: tomcat/native/trunk/native/os/win32/libtcnative.rc
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/os/win32/libtcnative.rc?rev=1848362&r1=1848361&r2=1848362&view=diff
==
--- tomcat/native/trunk/native/os/win32/libtcnative.rc (original)
+++ tomcat/native/trunk/native/os/win32/libtcnative.rc Thu Dec  6 20:38:12 2018
@@ -20,7 +20,7 @@ LANGUAGE 0x9,0x1
  "See the License for the specific language governing " \
  "permissions and limitations under the License."
 
-#define TCN_VERSION "1.2.19"
+#define TCN_VERSION "1.2.20"
 1000 ICON "apache.ico"
 
 1001 DIALOGEX 0, 0, 252, 51
@@ -36,8 +36,8 @@ BEGIN
 END
 
 1 VERSIONINFO
- FILEVERSION 1,2,19,0
- PRODUCTVERSION 1,2,19,0
+ FILEVERSION 1,2,20,0
+ PRODUCTVERSION 1,2,20,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1848362&r1=1848361&r2=1848362&view=diff
==
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Thu Dec  6 20:38:12 
2018
@@ -34,6 +34,8 @@
   This is the Changelog for Tomcat Native 1.2.
   
 
+
+
 
   
 



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

[GUMP@vmgump-vm3]: Project tomcat-trunk-test-nio (in module tomcat-trunk) failed

2018-12-06 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-trunk-test-nio has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-nio :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 24 mins 17 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO -Dexecute.test.nio2=false 
-Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20181206/bin/openssl
 -Dtest.temp=output/test-tmp-NIO 
 -Dtest.accesslog=true -Dexecute.test.nio=true 
-Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dexecute.test.apr=false -Dtest.excludePerformance=true -Dtest.relaxTiming=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.1-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output

svn commit: r1848363 - in /tomcat/tags/TOMCAT_9_0_14: ./ build.properties.default webapps/docs/changelog.xml

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 21:09:34 2018
New Revision: 1848363

URL: http://svn.apache.org/viewvc?rev=1848363&view=rev
Log:
Tag 9.0.14

Added:
tomcat/tags/TOMCAT_9_0_14/   (props changed)
  - copied from r1848362, tomcat/trunk/
Modified:
tomcat/tags/TOMCAT_9_0_14/build.properties.default
tomcat/tags/TOMCAT_9_0_14/webapps/docs/changelog.xml

Propchange: tomcat/tags/TOMCAT_9_0_14/
--
bugtraq:append = false

Propchange: tomcat/tags/TOMCAT_9_0_14/
--
bugtraq:label = Bugzilla ID (optional)

Propchange: tomcat/tags/TOMCAT_9_0_14/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Thu Dec  6 21:09:34 2018
@@ -0,0 +1,2 @@
+(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+)
+(\d+)

Propchange: tomcat/tags/TOMCAT_9_0_14/
--
bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tags/TOMCAT_9_0_14/
--
bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tags/TOMCAT_9_0_14/
--
--- svn:ignore (added)
+++ svn:ignore Thu Dec  6 21:09:34 2018
@@ -0,0 +1,8 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml
+temp

Propchange: tomcat/tags/TOMCAT_9_0_14/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Dec  6 21:09:34 2018
@@ -0,0 +1,3 @@
+/tomcat/tc8.0.x/trunk:1809644
+/tomcat/tc8.5.x/trunk:1802799,1808880,1809646
+/tomcat/trunk:1816751-1816762

Propchange: tomcat/tags/TOMCAT_9_0_14/
--
svnmailer:content-charset = utf-8

Modified: tomcat/tags/TOMCAT_9_0_14/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_14/build.properties.default?rev=1848363&r1=1848362&r2=1848363&view=diff
==
--- tomcat/tags/TOMCAT_9_0_14/build.properties.default (original)
+++ tomcat/tags/TOMCAT_9_0_14/build.properties.default Thu Dec  6 21:09:34 2018
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=14
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed

Modified: tomcat/tags/TOMCAT_9_0_14/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_14/webapps/docs/changelog.xml?rev=1848363&r1=1848362&r2=1848363&view=diff
==
--- tomcat/tags/TOMCAT_9_0_14/webapps/docs/changelog.xml (original)
+++ tomcat/tags/TOMCAT_9_0_14/webapps/docs/changelog.xml Thu Dec  6 21:09:34 
2018
@@ -1,4 +1,4 @@
-
+ï»¿
 
-
+
   
 
   



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

svn commit: r1848365 - in /tomcat/trunk: build.properties.default res/maven/mvn-pub.xml res/maven/mvn.properties.default webapps/docs/changelog.xml

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 21:28:18 2018
New Revision: 1848365

URL: http://svn.apache.org/viewvc?rev=1848365&view=rev
Log:
Increment version number for next dev cycle

Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/res/maven/mvn-pub.xml
tomcat/trunk/res/maven/mvn.properties.default
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1848365&r1=1848364&r2=1848365&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Dec  6 21:28:18 2018
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=9
 version.minor=0
-version.build=14
+version.build=15
 version.patch=0
 version.suffix=-dev
 

Modified: tomcat/trunk/res/maven/mvn-pub.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?rev=1848365&r1=1848364&r2=1848365&view=diff
==
--- tomcat/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/trunk/res/maven/mvn-pub.xml Thu Dec  6 21:28:18 2018
@@ -76,7 +76,7 @@
 
 
 
-
+
   
 
   

Modified: tomcat/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=1848365&r1=1848364&r2=1848365&view=diff
==
--- tomcat/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/trunk/res/maven/mvn.properties.default Thu Dec  6 21:28:18 2018
@@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=9.0.14
+maven.asf.release.deploy.version=9.0.15
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1848365&r1=1848364&r2=1848365&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Dec  6 21:28:18 2018
@@ -44,7 +44,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   



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

svn commit: r1848366 - /tomcat/trunk/res/maven/mvn-pub.xml

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 21:28:49 2018
New Revision: 1848366

URL: http://svn.apache.org/viewvc?rev=1848366&view=rev
Log:
Parameterise version number

Modified:
tomcat/trunk/res/maven/mvn-pub.xml

Modified: tomcat/trunk/res/maven/mvn-pub.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?rev=1848366&r1=1848365&r2=1848366&view=diff
==
--- tomcat/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/trunk/res/maven/mvn-pub.xml Thu Dec  6 21:28:49 2018
@@ -76,7 +76,7 @@
 
 
 
-
+
   
 
   



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

svn commit: r31413 [2/2] - in /dev/tomcat/tomcat-9/v9.0.14: ./ bin/ bin/embed/ bin/extras/ src/

2018-12-06 Thread markt

Added: dev/tomcat/tomcat-9/v9.0.14/src/apache-tomcat-9.0.14-src.zip.sha512
==
--- dev/tomcat/tomcat-9/v9.0.14/src/apache-tomcat-9.0.14-src.zip.sha512 (added)
+++ dev/tomcat/tomcat-9/v9.0.14/src/apache-tomcat-9.0.14-src.zip.sha512 Thu Dec 
 6 21:37:14 2018
@@ -0,0 +1 @@
+2b05d8f05796b479c467f434ab2221f9a5d3f19f74fd458259d1a2c1558b4c18877b094ed694c3f45653340e7eb71ebc6f3b8d0bb70a96be2cf43894f2654f7f
 *apache-tomcat-9.0.14-src.zip
\ No newline at end of file



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

svn commit: r31413 [1/2] - in /dev/tomcat/tomcat-9/v9.0.14: ./ bin/ bin/embed/ bin/extras/ src/

2018-12-06 Thread markt

Author: markt
Date: Thu Dec  6 21:37:14 2018
New Revision: 31413

Log:
Upload Upload 9.0.14 for voting

Added:
dev/tomcat/tomcat-9/v9.0.14/
dev/tomcat/tomcat-9/v9.0.14/KEYS
dev/tomcat/tomcat-9/v9.0.14/README.html
dev/tomcat/tomcat-9/v9.0.14/RELEASE-NOTES
dev/tomcat/tomcat-9/v9.0.14/bin/
dev/tomcat/tomcat-9/v9.0.14/bin/README.html
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14-deployer.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14-deployer.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14-deployer.zip   (with 
props)
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14-deployer.zip.asc
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14-deployer.zip.sha512
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14-fulldocs.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14-windows-x64.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14-windows-x64.zip.asc
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14-windows-x64.zip.sha512
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14-windows-x86.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14-windows-x86.zip.asc
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14-windows-x86.zip.sha512
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14.exe   (with props)
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14.exe.asc
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14.exe.sha512
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14.tar.gz   (with props)
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14.zip   (with props)
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14.zip.asc
dev/tomcat/tomcat-9/v9.0.14/bin/apache-tomcat-9.0.14.zip.sha512
dev/tomcat/tomcat-9/v9.0.14/bin/embed/
dev/tomcat/tomcat-9/v9.0.14/bin/embed/apache-tomcat-9.0.14-embed.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.14/bin/embed/apache-tomcat-9.0.14-embed.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.14/bin/embed/apache-tomcat-9.0.14-embed.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.14/bin/embed/apache-tomcat-9.0.14-embed.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.14/bin/embed/apache-tomcat-9.0.14-embed.zip.asc
dev/tomcat/tomcat-9/v9.0.14/bin/embed/apache-tomcat-9.0.14-embed.zip.sha512
dev/tomcat/tomcat-9/v9.0.14/bin/extras/
dev/tomcat/tomcat-9/v9.0.14/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-9/v9.0.14/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-9/v9.0.14/bin/extras/catalina-jmx-remote.jar.sha512
dev/tomcat/tomcat-9/v9.0.14/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-9/v9.0.14/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-9/v9.0.14/bin/extras/catalina-ws.jar.sha512
dev/tomcat/tomcat-9/v9.0.14/src/
dev/tomcat/tomcat-9/v9.0.14/src/apache-tomcat-9.0.14-src.tar.gz   (with 
props)
dev/tomcat/tomcat-9/v9.0.14/src/apache-tomcat-9.0.14-src.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.14/src/apache-tomcat-9.0.14-src.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.14/src/apache-tomcat-9.0.14-src.zip   (with props)
dev/tomcat/tomcat-9/v9.0.14/src/apache-tomcat-9.0.14-src.zip.asc
dev/tomcat/tomcat-9/v9.0.14/src/apache-tomcat-9.0.14-src.zip.sha512

Added: dev/tomcat/tomcat-9/v9.0.14/KEYS
==
--- dev/tomcat/tomcat-9/v9.0.14/KEYS (added)
+++ dev/tomcat/tomcat-9/v9.0.14/KEYS Thu Dec  6 21:37:14 2018
@@ -0,0 +1,676 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use 
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz
+gNftTbKx/MVS7cQU0II8

[VOTE] Release Apache Tomcat 9.0.14

2018-12-06 Thread Mark Thomas

The proposed Apache Tomcat 9.0.14 release is now available for voting.

The major changes compared to the 9.0.13 release are:

- Significant expansion of localisation support with the addition of
  Brazilian Portuguese, Korean and Chinese (simplified) as well as
  the expansion of coverage for existing languages

- Refactor back ground processing and various independent thread pools
  to use a common executor

- Update the packaged version of the Tomcat Native Library to 1.2.19 to
  pick up the latest Windows binaries built with APR 1.6.5 and OpenSSL
  1.1.1a.

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.14/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1199/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_14/

The proposed 9.0.14 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 9.0.14

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

[GUMP@vmgump-vm3]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed

2018-12-06 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-trunk-test-nio2 has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-nio2 :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 24 mins 5 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 -Dexecute.test.nio2=true 
-Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20181206/bin/openssl
 -Dtest.temp=output/test-tmp-NIO2
  -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dexecute.test.apr=false -Dtest.excludePerformance=true -Dtest.relaxTiming=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.1-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk

Re: [VOTE] Release Apache Tomcat 9.0.14

2018-12-06 Thread Igal Sapir


On 12/6/2018 1:37 PM, Mark Thomas wrote:

The proposed Apache Tomcat 9.0.14 release is now available for voting.

The major changes compared to the 9.0.13 release are:

- Significant expansion of localisation support with the addition of
   Brazilian Portuguese, Korean and Chinese (simplified) as well as
   the expansion of coverage for existing languages

- Refactor back ground processing and various independent thread pools
   to use a common executor

- Update the packaged version of the Tomcat Native Library to 1.2.19 to
   pick up the latest Windows binaries built with APR 1.6.5 and OpenSSL
   1.1.1a.

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.14/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1199/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_14/

The proposed 9.0.14 release is:
[ ] Broken - do not release
[X] Stable - go ahead and release as 9.0.14


Tested on Windows 10 with Java 8u181

Igal


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

[GUMP@vmgump-vm3]: Project tomcat-native-trunk-make (in module tomcat-native-trunk) failed

2018-12-06 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-native-trunk-make has an issue affecting its community 
integration.
This issue affects 3 projects,
 and has been outstanding for 2 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-native-trunk-make :  Tomcat native library using Apache Portable 
Runtime
- tomcat-native-trunk-make-install :  Tomcat native library using Apache 
Portable Runtime
- tomcat-trunk-test-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump-vm3.apache.org/tomcat-native-trunk/tomcat-native-trunk-make/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-native-trunk/tomcat-native-trunk-make/gump_work/build_tomcat-native-trunk_tomcat-native-trunk-make.html
Work Name: build_tomcat-native-trunk_tomcat-native-trunk-make (Type: Build)
Work ended in a state of : Failed
Elapsed: 6 secs
Command Line: make 
[Working Directory: /srv/gump/public/workspace/tomcat-native-trunk/native]
-
 ^
src/ssl.c: In function 'Java_org_apache_tomcat_jni_SSL_initialize':
/srv/gump/public/workspace/openssl-master/dest-20181207/include/openssl/opensslv.h:134:11:
 error: missing binary operator before token "("
 (long)( (OPENSSL_VERSION_MAJOR<<28)  \
   ^
src/ssl.c:741:36: note: in expansion of macro 'OPENSSL_VERSION_NUMBER'
 #if !defined(OPENSSL_NO_ENGINE) || OPENSSL_VERSION_NUMBER < 0x1010L
^
/srv/gump/public/workspace/openssl-master/dest-20181207/include/openssl/opensslv.h:134:11:
 error: missing binary operator before token "("
 (long)( (OPENSSL_VERSION_MAJOR<<28)  \
   ^
src/ssl.c:772:5: note: in expansion of macro 'OPENSSL_VERSION_NUMBER'
 #if OPENSSL_VERSION_NUMBER < 0x1010L
 ^
src/ssl.c:796:17: error: 'err' undeclared (first use in this function)
 err = APR_ENOTIMPL;
 ^
src/ssl.c:796:17: note: each undeclared identifier is reported only once for 
each function it appears in
In file included from ./include/ssl_private.h:37:0,
 from src/ssl.c:28:
/srv/gump/public/workspace/openssl-master/dest-20181207/include/openssl/opensslv.h:134:11:
 error: missing binary operator before token "("
 (long)( (OPENSSL_VERSION_MAJOR<<28)  \
   ^
src/ssl.c:829:5: note: in expansion of macro 'OPENSSL_VERSION_NUMBER'
 #if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
 ^
src/ssl.c: In function 'jbs_new':
/srv/gump/public/workspace/openssl-master/dest-20181207/include/openssl/opensslv.h:134:11:
 error: missing binary operator before token "("
 (long)( (OPENSSL_VERSION_MAJOR<<28)  \
   ^
src/ssl.c:991:5: note: in expansion of macro 'OPENSSL_VERSION_NUMBER'
 #if OPENSSL_VERSION_NUMBER < 0x1010L
 ^
src/ssl.c: At top level:
/srv/gump/public/workspace/openssl-master/dest-20181207/include/openssl/opensslv.h:134:11:
 error: missing binary operator before token "("
 (long)( (OPENSSL_VERSION_MAJOR<<28)  \
   ^
src/ssl.c:1127:5: note: in expansion of macro 'OPENSSL_VERSION_NUMBER'
 #if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
 ^
src/ssl.c: In function 'BIO_jbs':
/srv/gump/public/workspace/openssl-master/dest-20181207/include/openssl/opensslv.h:134:11:
 error: missing binary operator before token "("
 (long)( (OPENSSL_VERSION_MAJOR<<28)  \
   ^
src/ssl.c:1163:5: note: in expansion of macro 'OPENSSL_VERSION_NUMBER'
 #if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
 ^
make[1]: *** [src/ssl.lo] Error 1
make[1]: Leaving directory 
`/srv/gump/public/workspace/tomcat-native-trunk/native'
make: *** [all-recursive] Error 1
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump-vm3.apache.org/tomcat-native-trunk/tomcat-native-trunk-make/rss.xml
- Atom: 
http://vmgump-vm3.apache.org/tomcat-native-trunk/tomcat-native-trunk-make/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 2018120706, vmgump-vm3.apache.org:vmgump:2018120706
Gump E-mail Identifier (unique within run) #3.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump-vm3]

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

[GUMP@vmgump-vm3]: Project tomcat-trunk-test-nio (in module tomcat-trunk) failed

2018-12-06 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-trunk-test-nio has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 2 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-nio :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 23 mins 42 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO -Dexecute.test.nio2=false 
-Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20181207/bin/openssl
 -Dtest.temp=output/test-tmp-NIO 
 -Dtest.accesslog=true -Dexecute.test.nio=true 
-Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dexecute.test.apr=false -Dtest.excludePerformance=true -Dtest.relaxTiming=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.1-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomca

[GUMP@vmgump-vm3]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed

2018-12-06 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-trunk-test-nio2 has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 2 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-nio2 :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 23 mins 40 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 -Dexecute.test.nio2=true 
-Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20181207/bin/openssl
 -Dtest.temp=output/test-tmp-NIO2
  -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dexecute.test.apr=false -Dtest.excludePerformance=true -Dtest.relaxTiming=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.1-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/work

78 matches

Mail list logo