Author: markt Date: Wed Dec 12 09:43:25 2018 New Revision: 1848733 URL: http://svn.apache.org/viewvc?rev=1848733&view=rev Log: Improve messages based on feedback from woonsan
Modified: tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties Modified: tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties?rev=1848733&r1=1848732&r2=1848733&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties [UTF-8] (original) +++ tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties [UTF-8] Wed Dec 12 09:43:25 2018 @@ -41,7 +41,7 @@ defaultServlet.noResources=No static res defaultServlet.readerCloseFailed=Failed to close reader defaultServlet.xslError=XSL transformer error -defaultservlet.skipfail=Only skipped [{0}] bytes when [{1}] were requested +defaultservlet.skipfail=Read failed because only [{0}] bytes were available but needed to skip [{1}] bytes to reach the start of the requested range directory.filename=Filename directory.lastModified=Last Modified 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=1848733&r1=1848732&r2=1848733&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] Wed Dec 12 09:43:25 2018 @@ -23,7 +23,7 @@ nioReceiver.start.fail=Unable to start c nioReceiver.stop.fail=Unable to close cluster receiver selector nioReceiver.stop.threadRunning=The NioReceiver thread did not stop in a timely manner. Errors may be observed when the selector is closed. nioReceiver.threadpool.fail=ThreadPool cannot be initialized. Listener not started. -nioReceiver.threadsExhausted=Channel key is registered, but has had no interest ops for the last [{0}] ms. (cancelled: [{1}]):[{2}] last access:[{3} Possible cause: all threads used, perform thread dump +nioReceiver.threadsExhausted=Channel key is registered, but has had no interest ops for the last [{0}] ms. (cancelled: [{1}]):[{2}] last access:[{3}] Possible cause: all threads used, perform thread dump nioReplicationTask.error.register.key=Error registering key for read:[{0}] nioReplicationTask.exception.drainChannel=Exception caught in TcpReplicationThread.drainChannel. Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties?rev=1848733&r1=1848732&r2=1848733&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties [UTF-8] (original) +++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties [UTF-8] Wed Dec 12 09:43:25 2018 @@ -55,7 +55,7 @@ webXml.mergeConflictSessionCookieSecure= webXml.mergeConflictSessionTimeout=The session timeout was defined inconsistently in multiple fragments with different values including fragment with name [{0}] located at [{1}] webXml.mergeConflictSessionTrackingMode=The session tracking modes were defined inconsistently in multiple fragments including fragment with name [{0}] located at [{1}] webXml.mergeConflictString=The [{0}] with name [{1}] was defined inconsistently in multiple fragments including fragment with name [{2}] located at [{3}] -webXml.multipleOther=Multiple others entries in ordering +webXml.multipleOther=Multiple <others> entries nested in <ordering> element webXml.reservedName=A web.xml file was detected using a reserved name [{0}]. The name element will be ignored for this fragment. webXml.unrecognisedPublicId=The public ID [{0}] did not match any of the known public ID''s for web.xml files so the version could not be identified webXml.version.unknown=Unknown version string [{0}]. Default version will be used. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org