[tomcat] branch master updated: Restore JDBC store keys removed in error

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[tomcat] branch master updated: Restore JDBC store keys removed in error

markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new 15928ab  Restore JDBC store keys removed in error
15928ab is described below

commit 15928aba23fbf72deab1a7519f06b3018efbd78d
Author: Mark Thomas <[hidden email]>
AuthorDate: Wed Sep 11 13:28:56 2019 +0100

    Restore JDBC store keys removed in error
---
 java/org/apache/catalina/session/LocalStrings.properties       | 7 +++++++
 java/org/apache/catalina/session/LocalStrings_de.properties    | 1 +
 java/org/apache/catalina/session/LocalStrings_es.properties    | 5 +++++
 java/org/apache/catalina/session/LocalStrings_fr.properties    | 7 +++++++
 java/org/apache/catalina/session/LocalStrings_ja.properties    | 7 +++++++
 java/org/apache/catalina/session/LocalStrings_ko.properties    | 7 +++++++
 java/org/apache/catalina/session/LocalStrings_zh_CN.properties | 2 ++
 7 files changed, 36 insertions(+)

diff --git a/java/org/apache/catalina/session/LocalStrings.properties b/java/org/apache/catalina/session/LocalStrings.properties
index 91a42e8..e0a5487 100644
--- a/java/org/apache/catalina/session/LocalStrings.properties
+++ b/java/org/apache/catalina/session/LocalStrings.properties
@@ -14,10 +14,17 @@
 # limitations under the License.
 
 JDBCStore.SQLException=SQL Error [{0}]
+JDBCStore.checkConnectionClassNotFoundException=JDBC driver class not found [{0}]
+JDBCStore.checkConnectionDBClosed=The database connection is null or was found to be closed. Trying to re-open it.
+JDBCStore.checkConnectionDBReOpenFail=The re-open on the database failed. The database could be down.
+JDBCStore.checkConnectionSQLException=A SQL exception occurred [{0}]
 JDBCStore.close=Exception closing database connection [{0}]
+JDBCStore.commitSQLException=SQLException committing connection before closing
 JDBCStore.loading=Loading Session [{0}] from database [{1}]
+JDBCStore.missingDataSourceName=No valid JNDI name was given.
 JDBCStore.removing=Removing Session [{0}] at database [{1}]
 JDBCStore.saving=Saving Session [{0}] to database [{1}]
+JDBCStore.wrongDataSource=Cannot open JNDI DataSource [{0}]
 
 fileStore.createFailed=Unable to create directory [{0}] for the storage of session data
 fileStore.deleteFailed=Unable to delete file [{0}] which is preventing the creation of the session storage location
diff --git a/java/org/apache/catalina/session/LocalStrings_de.properties b/java/org/apache/catalina/session/LocalStrings_de.properties
index 3a44ac3..822c5bd 100644
--- a/java/org/apache/catalina/session/LocalStrings_de.properties
+++ b/java/org/apache/catalina/session/LocalStrings_de.properties
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+JDBCStore.missingDataSourceName=Kein gültiger JNDI Namen wurde übergeben.
 JDBCStore.saving=Speichere Session [{0}] in Datenbank [{1}]
 
 fileStore.deleteFailed=Kann Datei [{0}] nicht löschen. Das verhindert das Erzeugen des Ablageortes für die Session-Ablage
diff --git a/java/org/apache/catalina/session/LocalStrings_es.properties b/java/org/apache/catalina/session/LocalStrings_es.properties
index 22d072b..fe1a98e 100644
--- a/java/org/apache/catalina/session/LocalStrings_es.properties
+++ b/java/org/apache/catalina/session/LocalStrings_es.properties
@@ -14,8 +14,13 @@
 # limitations under the License.
 
 JDBCStore.SQLException=Error SQL [{0}]
+JDBCStore.checkConnectionClassNotFoundException=No se ha hallado la clase del manejador (driver) JDBC [{0}]
+JDBCStore.checkConnectionDBClosed=La conexióna a base de datos es nula o está cerrada. Intentando reabrirla.
+JDBCStore.checkConnectionDBReOpenFail=Falló la reapertura de la base de datos. Puede que la base de datos esté caída.
+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}]
 
diff --git a/java/org/apache/catalina/session/LocalStrings_fr.properties b/java/org/apache/catalina/session/LocalStrings_fr.properties
index f533662..a2907fd 100644
--- a/java/org/apache/catalina/session/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/session/LocalStrings_fr.properties
@@ -14,10 +14,17 @@
 # limitations under the License.
 
 JDBCStore.SQLException=Erreur SQL [{0}]
+JDBCStore.checkConnectionClassNotFoundException=La classe du driver JDBC n''a pas été trouvée [{0}]
+JDBCStore.checkConnectionDBClosed=La connexion à la base de données est nulle ou a été trouvée fermée. Tentative de réouverture.
+JDBCStore.checkConnectionDBReOpenFail=La tentative de réouverture de la base de données a échoué. La base de données est peut-être arrêtée.
+JDBCStore.checkConnectionSQLException=Une exception SQL s''est produite [{0}]
 JDBCStore.close=Exception lors de la fermeture de la connection vers la base de donnée [{0}]
+JDBCStore.commitSQLException=Une SQLException a été retournée lors du commit de la connection avant sa fermeture
 JDBCStore.loading=Chargement de la Session [{0}] depuis la base de données [{1}]
+JDBCStore.missingDataSourceName=Aucun nom JNDI valide n'a été donné.
 JDBCStore.removing=Retrait de la Session [{0}] de la base de données [{1}]
 JDBCStore.saving=Sauvegarde de la Session [{0}] vers la base de données [{1}]
+JDBCStore.wrongDataSource=Impossible d''ouvrir la DataSource JNDI [{0}]
 
 fileStore.createFailed=Impossible de créer le répertoire [{0}] pour stocker les données de session
 fileStore.deleteFailed=Impossible d''effacer le fichier [{0}] qui empêche la création du support de stockage de sessions
diff --git a/java/org/apache/catalina/session/LocalStrings_ja.properties b/java/org/apache/catalina/session/LocalStrings_ja.properties
index 7e10ad6..d49f9f1 100644
--- a/java/org/apache/catalina/session/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/session/LocalStrings_ja.properties
@@ -14,10 +14,17 @@
 # limitations under the License.
 
 JDBCStore.SQLException=SQLエラー [{0}]
+JDBCStore.checkConnectionClassNotFoundException=JDBCドライバクラスが見つかりません [{0}]
+JDBCStore.checkConnectionDBClosed=データベース接続がnullであるか、クローズされているのが見つかりました。再オープンしてください。
+JDBCStore.checkConnectionDBReOpenFail=データベースの再オープンが失敗しました。データベースがダウンしているかもしれません。
+JDBCStore.checkConnectionSQLException=SQL例外が発生しました [{0}]
 JDBCStore.close=データベース接続 [{0}] をクローズ中の例外です
+JDBCStore.commitSQLException=クローズする前に接続をコミットするSQLException
 JDBCStore.loading=セッション [{0}] をデータベース [{1}] からロードします
+JDBCStore.missingDataSourceName=指定された JNDI 名は正常ではありません
 JDBCStore.removing=セッション [{0}] をデータベース [{1}] から削除します
 JDBCStore.saving=セッション [{0}] をデータベース [{1}] に保存します
+JDBCStore.wrongDataSource=JNDIデータソース[{0}]を開くことができません。
 
 fileStore.createFailed=セッションデータを格納するディレクトリ[{0}]を作成できません
 fileStore.deleteFailed=ファイル [{0}] を削除できなかったため、セッションストレージを作成できません。
diff --git a/java/org/apache/catalina/session/LocalStrings_ko.properties b/java/org/apache/catalina/session/LocalStrings_ko.properties
index 53f4d09..c2a9b39 100644
--- a/java/org/apache/catalina/session/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/session/LocalStrings_ko.properties
@@ -14,10 +14,17 @@
 # limitations under the License.
 
 JDBCStore.SQLException=SQL 오류 [{0}]
+JDBCStore.checkConnectionClassNotFoundException=JDBC 드라이버 클래스를 찾을 수 없습니다: [{0}]
+JDBCStore.checkConnectionDBClosed=데이터베이스 연결이 널이거나 닫힌 상태입니다. 다시 열려고 시도합니다.
+JDBCStore.checkConnectionDBReOpenFail=데이터베이스에 대해 다시 연결을 맺지 못했습니다. 데이터베이스가 다운되었을 수 있습니다.
+JDBCStore.checkConnectionSQLException=SQL 예외 발생 [{0}]
 JDBCStore.close=데이터베이스 연결 [{0}]을(를) 닫는 동안 예외 발생
+JDBCStore.commitSQLException=데이터베이스 연결을 닫기 전, 커밋을 시도하는 중 SQLException 발생
 JDBCStore.loading=데이터베이스 [{1}](으)로부터 세션 [{0}]을(를) 로드합니다.
+JDBCStore.missingDataSourceName=유효한 JNDI 이름이 주어지지 않았습니다.
 JDBCStore.removing=데이터베이스 [{1}]에서 세션 [{0}]을(를) 제거합니다.
 JDBCStore.saving=세션 [{0}]을(를) 데이터베이스 [{1}]에 저장합니다.
+JDBCStore.wrongDataSource=JNDI DataSource [{0}]을(를) 열 수 없습니다.
 
 fileStore.createFailed=세션 데이터 저장소를 위한 디렉토리[{0}]을(를) 생성할 수 없습니다.
 fileStore.deleteFailed=파일 [{0}]을(를) 삭제할 수 없습니다. 이는 세션 저장소 위치의 생성을 방해하고 있습니다.
diff --git a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
index deef38b..64ccd63 100644
--- a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+JDBCStore.checkConnectionDBReOpenFail=重新打开数据库失败,数据库可能已经宕机。
+JDBCStore.missingDataSourceName=没有给出有效的 JNDI 名称。
 JDBCStore.saving=保存Session [{0}] 到数据库 [{1}]
 
 fileStore.deleteFailed=无法删除阻止创建会话存储位置的文件 [{0}]


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]