From 6ca8a6cf583896a5d052edc95b4277a70fb17bb4 Mon Sep 17 00:00:00 2001 From: sogabe Date: Sat, 14 Feb 2009 12:16:44 +0000 Subject: [PATCH] move help.html of PAMSecurityRealm to war/resources/help/security. I18N and L10N for PAMSecurityRealm. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@15337 71c3de6d-444a-0410-be80-ed276b4c234a --- .../hudson/security/PAMSecurityRealm.java | 8 ++++++- .../hudson/security/Messages.properties | 2 ++ .../hudson/security/Messages_ja.properties | 2 ++ .../PAMSecurityRealm/config_ja.properties | 23 +++++++++++++++++++ .../resources/help/security/pam-realm.html | 2 +- war/resources/help/security/pam-realm_ja.html | 14 +++++++++++ 6 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 core/src/main/resources/hudson/security/PAMSecurityRealm/config_ja.properties rename core/src/main/resources/hudson/security/PAMSecurityRealm/help.html => war/resources/help/security/pam-realm.html (95%) create mode 100644 war/resources/help/security/pam-realm_ja.html diff --git a/core/src/main/java/hudson/security/PAMSecurityRealm.java b/core/src/main/java/hudson/security/PAMSecurityRealm.java index 2a64aab5ad..cc3e5023bc 100644 --- a/core/src/main/java/hudson/security/PAMSecurityRealm.java +++ b/core/src/main/java/hudson/security/PAMSecurityRealm.java @@ -116,8 +116,14 @@ public class PAMSecurityRealm extends SecurityRealm { public static final class DescriptorImpl extends Descriptor { public String getDisplayName() { - return "Unix user/group database"; + return Messages.PAMSecurityRealm_DisplayName(); } + + @Override + public String getHelpFile() { + return "/help/security/pam-realm.html"; + } + } static { diff --git a/core/src/main/resources/hudson/security/Messages.properties b/core/src/main/resources/hudson/security/Messages.properties index 4b7a6cd5a3..92464de352 100644 --- a/core/src/main/resources/hudson/security/Messages.properties +++ b/core/src/main/resources/hudson/security/Messages.properties @@ -44,5 +44,7 @@ UserDetailsServiceProxy.UnableToQuery=Unable to query user information: {0} ProjectMatrixAuthorizationStrategy.DisplayName=Project-based Matrix Authorization Strategy +PAMSecurityRealm.DisplayName=Unix user/group database + # not in use Permission.Permissions.Title=N/A diff --git a/core/src/main/resources/hudson/security/Messages_ja.properties b/core/src/main/resources/hudson/security/Messages_ja.properties index 39655d2bd5..bc72c4a26f 100644 --- a/core/src/main/resources/hudson/security/Messages_ja.properties +++ b/core/src/main/resources/hudson/security/Messages_ja.properties @@ -42,5 +42,7 @@ UserDetailsServiceProxy.UnableToQuery={0}\u306E\u30E6\u30FC\u30B6\u30FC\u60C5\u5 ProjectMatrixAuthorizationStrategy.DisplayName=\u884C\u5217\u306B\u3088\u308B\u6A29\u9650\u8A2D\u5B9A(\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5358\u4F4D) +PAMSecurityRealm.DisplayName=Unix \u30E6\u30FC\u30B6\u30FC/\u30B0\u30EB\u30FC\u30D7 \u30C7\u30FC\u30BF\u30D9\u30FC\u30B9 + # not in use Permission.Permissions.Title=N/A \ No newline at end of file diff --git a/core/src/main/resources/hudson/security/PAMSecurityRealm/config_ja.properties b/core/src/main/resources/hudson/security/PAMSecurityRealm/config_ja.properties new file mode 100644 index 0000000000..da8872cdc5 --- /dev/null +++ b/core/src/main/resources/hudson/security/PAMSecurityRealm/config_ja.properties @@ -0,0 +1,23 @@ +# The MIT License +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Seiji Sogabe +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Service\ Name=\u30B5\u30FC\u30D3\u30B9\u540D \ No newline at end of file diff --git a/core/src/main/resources/hudson/security/PAMSecurityRealm/help.html b/war/resources/help/security/pam-realm.html similarity index 95% rename from core/src/main/resources/hudson/security/PAMSecurityRealm/help.html rename to war/resources/help/security/pam-realm.html index 68c6890e7a..945eb92dd5 100644 --- a/core/src/main/resources/hudson/security/PAMSecurityRealm/help.html +++ b/war/resources/help/security/pam-realm.html @@ -1,6 +1,6 @@
Delegates the authentication to the underlying Unix operating system user database. - With this setting, users will be logged into Hudson by entering their Unix usrname + With this setting, users will be logged into Hudson by entering their Unix username and password.

diff --git a/war/resources/help/security/pam-realm_ja.html b/war/resources/help/security/pam-realm_ja.html new file mode 100644 index 0000000000..5ba7059395 --- /dev/null +++ b/war/resources/help/security/pam-realm_ja.html @@ -0,0 +1,14 @@ +

+ Hudsonの認証を、使用しているUnixOSのユーザーデータベースに委譲します。 + この設定を行うと、Unixのユーザー名とパスワードでHudsonにログインすることができます。 + +

+ このモードでは、権限管理にUnixのグループを使用することもできます。 + 例えば、"'developers'グループに属する全てのユーザーが管理者権限を持つ"といったことが可能です。 + +

+ この認証は、PAMと呼ばれるライブラリを使用して行われます。 + そして、PAMには独自の設定の仕組みがあります。 + また、NIS + のような拡張ユーザーデータベースを使用しても動作します。 +

\ No newline at end of file