[tomcat] branch 8.5.x updated: Add missing string
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 0ebce004c4 Add missing string
0ebce004c4 is described below
commit 0ebce004c4229363515864f3a96c51de43ed4c70
Author: remm
AuthorDate: Tue Oct 17 10:41:56 2023 +0200
Add missing string
---
java/org/apache/catalina/manager/host/HostManagerServlet.java | 2 +-
java/org/apache/catalina/manager/host/LocalStrings.properties | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/manager/host/HostManagerServlet.java
b/java/org/apache/catalina/manager/host/HostManagerServlet.java
index c9ce8398f0..b869270215 100644
--- a/java/org/apache/catalina/manager/host/HostManagerServlet.java
+++ b/java/org/apache/catalina/manager/host/HostManagerServlet.java
@@ -621,7 +621,7 @@ public class HostManagerServlet extends HttpServlet
implements ContainerServlet
// catch InstanceNotFoundException when StoreConfig is not enabled
instead of printing
// the failure message
if (e instanceof InstanceNotFoundException) {
-writer.println("Please enable StoreConfig to use this
feature.");
+
writer.println(smClient.getString("hostManagerServlet.noStoreConfig"));
} else {
writer.println(smClient.getString("hostManagerServlet.exception",
e.toString()));
}
diff --git a/java/org/apache/catalina/manager/host/LocalStrings.properties
b/java/org/apache/catalina/manager/host/LocalStrings.properties
index 5e549f3796..8be8a004dc 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings.properties
@@ -31,6 +31,7 @@ hostManagerServlet.listed=OK - Listed hosts
hostManagerServlet.managerXml=FAIL - Couldn't install manager.xml
hostManagerServlet.noCommand=FAIL - No command was specified
hostManagerServlet.noHost=FAIL - Host name [{0}] does not exist
+hostManagerServlet.noStoreConfig=FAIL - Please enable StoreConfig to use this
feature
hostManagerServlet.noWrapper=Container has not called setWrapper() for this
servlet
hostManagerServlet.persist=persist: Persisting current configuration
hostManagerServlet.persistFailed=FAIL - Failed to persist configuration
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Add missing string
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 6228c43 Add missing string
6228c43 is described below
commit 6228c4355760f076f2d64d782214c2592d98bd52
Author: Mark Thomas
AuthorDate: Thu Oct 7 16:20:17 2021 +0100
Add missing string
---
java/org/apache/jasper/resources/LocalStrings.properties | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties
b/java/org/apache/jasper/resources/LocalStrings.properties
index eb8b0b3..f25def5 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -49,6 +49,7 @@ jsp.error.cannotAddResolver=Cannot call addELResolver after
the first request ha
jsp.error.classname=Cannot determine classname from .class file
jsp.error.coerce_to_type=Cannot coerce value [{2}] to type [{1}] for attribute
[{0}].
jsp.error.compilation=Error compiling file: [{0}] [{1}]
+jsp.error.compilation.dependent=Failed to load class [{0}]
jsp.error.compilation.jdt=Compilation error
jsp.error.compilation.jdtProblemError=Error processing JDT problems list
jsp.error.compilation.source=Error loading source file [{0}]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Add missing string
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 5856971 Add missing string
5856971 is described below
commit 5856971cef7f96581b3a4f4b1c5c26cce75c8d70
Author: remm
AuthorDate: Tue Jul 6 14:46:58 2021 +0200
Add missing string
---
java/org/apache/catalina/realm/DataSourceRealm.java| 2 +-
java/org/apache/catalina/realm/LocalStrings.properties | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/realm/DataSourceRealm.java
b/java/org/apache/catalina/realm/DataSourceRealm.java
index 6da6b69..4543f01 100644
--- a/java/org/apache/catalina/realm/DataSourceRealm.java
+++ b/java/org/apache/catalina/realm/DataSourceRealm.java
@@ -368,7 +368,7 @@ public class DataSourceRealm extends RealmBase {
dbConnection.commit();
}
} catch (SQLException e) {
-containerLog.error("Exception committing connection before
closing:", e);
+containerLog.error(sm.getString("dataSourceRealm.commit"), e);
}
// Close this database connection, and log any errors
diff --git a/java/org/apache/catalina/realm/LocalStrings.properties
b/java/org/apache/catalina/realm/LocalStrings.properties
index 8b4f5ca..2b4eb86 100644
--- a/java/org/apache/catalina/realm/LocalStrings.properties
+++ b/java/org/apache/catalina/realm/LocalStrings.properties
@@ -28,6 +28,7 @@ credentialHandler.invalidStoredCredential=The invalid stored
credential string [
dataSourceRealm.authenticateFailure=Username [{0}] NOT successfully
authenticated
dataSourceRealm.authenticateSuccess=Username [{0}] successfully authenticated
dataSourceRealm.close=Exception closing database connection
+dataSourceRealm.commit=Exception committing connection before closing
dataSourceRealm.exception=Exception performing authentication
dataSourceRealm.getPassword.exception=Exception retrieving password for [{0}]
dataSourceRealm.getRoles.exception=Exception retrieving roles for [{0}]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Add missing string
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 99bb0a1 Add missing string
99bb0a1 is described below
commit 99bb0a1f5a462781d4e7231ba629331d9db53e26
Author: Mark Thomas
AuthorDate: Tue Mar 16 16:10:10 2021 +
Add missing string
---
java/org/apache/jasper/resources/LocalStrings.properties | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties
b/java/org/apache/jasper/resources/LocalStrings.properties
index c95dad5..26b8adf 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -305,6 +305,7 @@ jsp.warning.strictQuoteEscaping=Warning: Invalid value for
the initParam strictQ
jsp.warning.suppressSmap=Warning: Invalid value for the initParam
suppressSmap. Will use the default value of "false"
jsp.warning.tagPreDestroy=Error processing preDestroy on tag instance of [{0}]
jsp.warning.tagRelease=Error processing release on tag instance of [{0}]
+jsp.warning.trimspaces=Warning: Invalid value for the initParam trimSpaces.
Will use the default value of "false"
jsp.warning.unknown.sourceVM=Unknown source VM [{0}] ignored
jsp.warning.unknown.targetVM=Unknown target VM [{0}] ignored
jsp.warning.unsupported.sourceVM=Unsupported source VM [{0}] requested, using
[{1}]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Add missing string
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new d0141cc Add missing string
d0141cc is described below
commit d0141cc3d0beff04860217a00b71820c8bc5b9ab
Author: remm
AuthorDate: Tue May 19 15:40:18 2020 +0200
Add missing string
---
java/org/apache/catalina/valves/rewrite/LocalStrings.properties | 2 ++
.../org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java | 8 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/valves/rewrite/LocalStrings.properties
b/java/org/apache/catalina/valves/rewrite/LocalStrings.properties
index 63ecfb3..e67d4ba 100644
--- a/java/org/apache/catalina/valves/rewrite/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/rewrite/LocalStrings.properties
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+quotedStringTokenizer.tokenizeError=Error tokenizing text [{0}] after position
[{1}] from mode [{2}]
+
rewriteValve.closeError=Error closing configuration
rewriteValve.invalidFlags=Invalid flag in [{0}] flags [{1}]
rewriteValve.invalidLine=Invalid line [{0}]
diff --git a/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
b/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
index 00aaa4a..a6204fb 100644
--- a/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
+++ b/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
@@ -21,8 +21,12 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import org.apache.tomcat.util.res.StringManager;
+
public class QuotedStringTokenizer {
+protected static final StringManager sm =
StringManager.getManager(QuotedStringTokenizer.class);
+
private Iterator tokenIterator;
private int tokenCount;
private int returnedTokens = 0;
@@ -70,8 +74,8 @@ public class QuotedStringTokenizer {
}
break;
default:
-throw new IllegalStateException(
-"Couldn't tokenize text '" + inputText + "' after
position " + pos + " from mode " + currentMode);
+throw new
IllegalStateException(sm.getString("quotedStringTokenizer.tokenizeError",
+inputText, Integer.valueOf(pos), currentMode));
}
pos++;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
