Author: markt
Date: Wed Nov 20 10:11:53 2013
New Revision: 1543755
URL: http://svn.apache.org/r1543755
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55798
Log an error if the users file can't be found
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/LocalStrings_es.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/LocalStrings_fr.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/LocalStrings_ja.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1543753
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/LocalStrings.properties?rev=1543755&r1=1543754&r2=1543755&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/LocalStrings.properties
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/LocalStrings.properties
Wed Nov 20 10:11:53 2013
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-memoryUserDatabase.invalidGroup=Invalid group name {0}
+memoryUserDatabase.fileNotFound=The specified user database [{0}] could not be
found
memoryUserDatabase.notPersistable=User database is not persistable - no write
permissions on directory
memoryUserDatabase.nullGroup=Null or zero length group name specified. The
group will be ignored.
memoryUserDatabase.nullRole=Null or zero length role name specified. The role
will be ignored.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/LocalStrings_es.properties?rev=1543755&r1=1543754&r2=1543755&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/LocalStrings_es.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/LocalStrings_es.properties
Wed Nov 20 10:11:53 2013
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-memoryUserDatabase.invalidGroup = Nombre de grupo {0} inv\u00E1lido
+
memoryUserDatabase.notPersistable = La base de datos de usuario no es
persistible - no hay permisos de grabaci\u00F3n sobre el directorio
memoryUserDatabase.nullGroup = Se ha especificado un nombre de grupo nulo o de
tama\u00F1o cero. Se ignora el grupo.
memoryUserDatabase.nullRole = Se ha especificado un nombre rol nulo o de
tama\u00F1o cero. Se ignora el rol.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/LocalStrings_fr.properties?rev=1543755&r1=1543754&r2=1543755&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/LocalStrings_fr.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/LocalStrings_fr.properties
Wed Nov 20 10:11:53 2013
@@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-memoryUserDatabase.invalidGroup=Nom de groupe invalide {0}
memoryUserDatabase.renameOld=Impossible de renommer le fichier original en {0}
memoryUserDatabase.renameNew=Impossible de renommer le nouveau fichier en {0}
memoryUserDatabase.writeException=IOException lors de l''\u00e9criture vers {0}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/LocalStrings_ja.properties?rev=1543755&r1=1543754&r2=1543755&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/LocalStrings_ja.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/LocalStrings_ja.properties
Wed Nov 20 10:11:53 2013
@@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-memoryUserDatabase.invalidGroup=\u7121\u52b9\u306a\u30b0\u30eb\u30fc\u30d7\u540d
{0}
memoryUserDatabase.renameOld=\u5143\u306e\u30d5\u30a1\u30a4\u30eb\u540d\u3092
{0} \u306b\u5909\u66f4\u3067\u304d\u307e\u305b\u3093
memoryUserDatabase.renameNew=\u65b0\u3057\u3044\u30d5\u30a1\u30a4\u30eb\u540d\u3092
{0} \u306b\u5909\u66f4\u3067\u304d\u307e\u305b\u3093
memoryUserDatabase.writeException={0}
\u306b\u66f8\u304d\u8fbc\u307f\u4e2d\u306eIOException\u3067\u3059
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java?rev=1543755&r1=1543754&r2=1543755&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
Wed Nov 20 10:11:53 2013
@@ -402,6 +402,8 @@ public class MemoryUserDatabase implemen
pathname);
}
if (!file.exists()) {
+ log.error(sm.getString("memoryUserDatabase.fileNotFound",
+ file.getAbsolutePath()));
return;
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1543755&r1=1543754&r2=1543755&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Nov 20 10:11:53 2013
@@ -136,6 +136,10 @@
<code>javax.security.sasl.qop</code> environment property for the LDAP
connection. (markt)
</fix>
+ <fix>
+ <bug>55798</bug>: Log an error if the MemoryUserDatabase is unable to
+ find the specified user database file. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
