Author: fschumacher
Date: Sat Sep 12 15:26:20 2015
New Revision: 1702640
URL: http://svn.apache.org/r1702640
Log:
Add LocalStrings entries for a few log-messages, that came with the original
patch in r964219. Added positional parameters to the placeholder.
Modified:
tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
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=1702640&r1=1702639&r2=1702640&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Sat Sep 12
15:26:20 2015
@@ -1524,7 +1524,7 @@ public class ExpiresFilter extends Filte
currentToken = tokenizer.nextToken();
} catch (NoSuchElementException e) {
throw new IllegalStateException(sm.getString(
- "Duration not found in directive '{}'", line));
+ "expiresFilter.noDurationFound", line));
}
if ("plus".equalsIgnoreCase(currentToken)) {
@@ -1533,7 +1533,7 @@ public class ExpiresFilter extends Filte
currentToken = tokenizer.nextToken();
} catch (NoSuchElementException e) {
throw new IllegalStateException(sm.getString(
- "Duration not found in directive '{}'", line));
+ "expiresFilter.noDurationFound", line));
}
}
@@ -1545,7 +1545,7 @@ public class ExpiresFilter extends Filte
amount = Integer.parseInt(currentToken);
} catch (NumberFormatException e) {
throw new IllegalStateException(sm.getString(
- "Invalid duration (number) '{}' in directive '{}'",
+ "expiresFilter.invalidDurationNumber",
currentToken, line));
}
@@ -1554,7 +1554,7 @@ public class ExpiresFilter extends Filte
} catch (NoSuchElementException e) {
throw new IllegalStateException(
sm.getString(
- "Duration unit not found after amount {} in
directive '{}'",
+ "expiresFilter.noDurationUnitAfterAmount",
Integer.valueOf(amount), line));
}
DurationUnit durationUnit;
@@ -1582,7 +1582,7 @@ public class ExpiresFilter extends Filte
} else {
throw new IllegalStateException(
sm.getString(
- "Invalid duration unit
(years|months|weeks|days|hours|minutes|seconds) '{}' in directive '{}'",
+ "expiresFilter.invalidDurationUnit",
currentToken, line));
}
Modified: tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties?rev=1702640&r1=1702639&r2=1702640&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties Sat
Sep 12 15:26:20 2015
@@ -33,14 +33,18 @@ expiresFilter.responseAlreadyCommited=Re
expiresFilter.noExpirationConfiguredForContentType=No Expires configuration
found for content-type "{0}"
expiresFilter.useMatchingConfiguration=Use {0} matching "{1}" for content-type
"{2}" returns {3}
expiresFilter.useDefaultConfiguration=Use default {0} for content-type "{1}"
returns {2}
+expiresFilter.noDurationFound=Duration not found in directive "{0}"
+expiresFilter.noDurationUnitAfterAmount=Duration unit not found after amount
"{0}" in directive "{1}"
expiresFilter.unsupportedStartingPoint=Unsupported startingPoint "{0}"
expiresFilter.unknownParameterIgnored=Unknown parameter "{0}" with value "{1}"
is ignored !
expiresFilter.exceptionProcessingParameter=Exception processing configuration
parameter "{0}":"{1}"
expiresFilter.filterInitialized=Filter initialized with configuration {0}
expiresFilter.expirationHeaderAlreadyDefined=Request "{0}" with response
status "{1}" content-type "{2}", expiration header already defined
expiresFilter.skippedStatusCode=Request "{0}" with response status "{1}"
content-type "{1}", skip expiration header generation for given status
+expiresFilter.invalidDurationNumber=Invalid duration (number) "{0}" in
directive "{1}"
+expiresFilter.invalidDurationUnit=Invalid duration unit
(years|months|weeks|days|hours|minutes|seconds) "{0}" in directive "{1}"
httpHeaderSecurityFilter.committed=Unable to add HTTP headers since response
is already committed on entry to the HTTP header security Filter
httpHeaderSecurityFilter.clickjack.invalid=An invalid value [{0}] was
specified for the anti click-jacking header
-remoteIpFilter.invalidLocation=Failed to modify the rewrite location [{0}] to
use scheme [{1}] and port [{2}]
\ No newline at end of file
+remoteIpFilter.invalidLocation=Failed to modify the rewrite location [{0}] to
use scheme [{1}] and port [{2}]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
