You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by wo...@apache.org on 2008/09/10 17:16:52 UTC
svn commit: r693867 - in
/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed:
exception/ security/
Author: woonsan
Date: Wed Sep 10 08:16:51 2008
New Revision: 693867
URL: http://svn.apache.org/viewvc?rev=693867&view=rev
Log:
Flattening Security APIs.
Added scoped resource strings.
Modified:
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties?rev=693867&r1=693866&r2=693867&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties Wed Sep 10 08:16:51 2008
@@ -13,7 +13,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# default fallback resource strings
org.apache.jetspeed.security.SecurityException.PRINCIPAL_DOES_NOT_EXIST = The principal {0} does not exist.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ALREADY_EXISTS = The principal {0} already exists.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_IS_READ_ONLY = The principal {0} is read-only.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_UPDATE_FAILURE = Failed to update principal {0}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_NOT_REMOVABLE = The principal {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.DEPENDENT_PRINCIPAL_EXISTS = The principal {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = The principal association to {0} is required.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The principal association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The principal association to {0} is not supported.
org.apache.jetspeed.security.SecurityException.PERMISSION_DOES_NOT_EXIST = The permission {0} does not exist.
org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = The user {0} already exists.
org.apache.jetspeed.security.SecurityException.USER_DOES_NOT_EXIST = The user {0} does not exist.
@@ -31,4 +40,34 @@
org.apache.jetspeed.security.SecurityException.ANONYMOUS_USER_PROTECTED = The user {0} is protected.
org.apache.jetspeed.security.SecurityException.UNEXPECTED = Unexpected security error at {0} from {1}: {2}
org.apache.jetspeed.security.SecurityException.INVALID_UID = The uid cannot contain any regular expression meta-characters or be null or be empty.
-org.apache.jetspeed.security.SecurityException.INVALID_DN = The dn cannot be null or empty.
\ No newline at end of file
+org.apache.jetspeed.security.SecurityException.INVALID_DN = The dn cannot be null or empty.
+
+# resource strings for specific principal, user
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ALREADY_EXISTS = The user {0} already exists.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_IS_READ_ONLY = The user {0} is read-only.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_UPDATE_FAILURE = Failed to update user {0}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_NOT_REMOVABLE = The user {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.user.DEPENDENT_PRINCIPAL_EXISTS = The user {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = The user association to {0} is required.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The user association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The user association to {0} is not supported.
+
+# resource strings for specific principal, role
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ALREADY_EXISTS = The role {0} already exists.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_IS_READ_ONLY = The role {0} is read-only.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_UPDATE_FAILURE = Failed to update role {0}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_NOT_REMOVABLE = The role {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.role.DEPENDENT_PRINCIPAL_EXISTS = The role {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = The role association to {0} is required.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The role association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The role association to {0} is not supported.
+
+# resource strings for specific principal, group
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ALREADY_EXISTS = The group {0} already exists.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_IS_READ_ONLY = The group {0} is read-only.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_UPDATE_FAILURE = Failed to update group {0}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_NOT_REMOVABLE = The group {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.group.DEPENDENT_PRINCIPAL_EXISTS = The group {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = The group association to {0} is required.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The group association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The group association to {0} is not supported.
\ No newline at end of file
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties?rev=693867&r1=693866&r2=693867&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties Wed Sep 10 08:16:51 2008
@@ -14,6 +14,14 @@
# limitations under the License.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_DOES_NOT_EXIST = The principal {0} does not exist.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ALREADY_EXISTS = The principal {0} already exists.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_IS_READ_ONLY = The principal {0} is read-only.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_UPDATE_FAILURE = Failed to update principal {0}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_NOT_REMOVABLE = The principal {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.DEPENDENT_PRINCIPAL_EXISTS = The principal {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = The principal association to {0} is required.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The principal association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The principal association to {0} is not supported.
org.apache.jetspeed.security.SecurityException.PERMISSION_DOES_NOT_EXIST = The permission {0} does not exist.
org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = The user {0} already exists.
org.apache.jetspeed.security.SecurityException.USER_DOES_NOT_EXIST = The user {0} does not exist.
@@ -32,3 +40,33 @@
org.apache.jetspeed.security.SecurityException.UNEXPECTED = Unexpected security error at {0} from {1}: {2}
org.apache.jetspeed.security.SecurityException.INVALID_UID = The uid cannot contain any regular expression meta-characters or be null or be empty.
org.apache.jetspeed.security.SecurityException.INVALID_DN = The dn cannot be null or empty.
+
+# resource strings for specific principal, user
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ALREADY_EXISTS = The user {0} already exists.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_IS_READ_ONLY = The user {0} is read-only.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_UPDATE_FAILURE = Failed to update user {0}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_NOT_REMOVABLE = The user {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.user.DEPENDENT_PRINCIPAL_EXISTS = The user {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = The user association to {0} is required.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The user association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The user association to {0} is not supported.
+
+# resource strings for specific principal, role
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ALREADY_EXISTS = The role {0} already exists.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_IS_READ_ONLY = The role {0} is read-only.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_UPDATE_FAILURE = Failed to update role {0}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_NOT_REMOVABLE = The role {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.role.DEPENDENT_PRINCIPAL_EXISTS = The role {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = The role association to {0} is required.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The role association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The role association to {0} is not supported.
+
+# resource strings for specific principal, group
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ALREADY_EXISTS = The group {0} already exists.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_IS_READ_ONLY = The group {0} is read-only.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_UPDATE_FAILURE = Failed to update group {0}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_NOT_REMOVABLE = The group {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.group.DEPENDENT_PRINCIPAL_EXISTS = The group {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = The group association to {0} is required.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The group association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The group association to {0} is not supported.
\ No newline at end of file
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties?rev=693867&r1=693866&r2=693867&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties Wed Sep 10 08:16:51 2008
@@ -14,6 +14,14 @@
# limitations under the License.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_DOES_NOT_EXIST = \u4e3b\u4f53 {0} \u304c\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ALREADY_EXISTS = The principal {0} already exists.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_IS_READ_ONLY = The principal {0} is read-only.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_UPDATE_FAILURE = Failed to update principal {0}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_NOT_REMOVABLE = The principal {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.DEPENDENT_PRINCIPAL_EXISTS = The principal {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = The principal association to {0} is required.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The principal association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The principal association to {0} is not supported.
org.apache.jetspeed.security.SecurityException.PERMISSION_DOES_NOT_EXIST = \u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3 {0} \u304c\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = \u30e6\u30fc\u30b6\u30fc {0} \u304c\u5b58\u5728\u3057\u307e\u3059\u3002
org.apache.jetspeed.security.SecurityException.USER_DOES_NOT_EXIST = \u30e6\u30fc\u30b6\u30fc {0} \u304c\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
@@ -32,3 +40,33 @@
org.apache.jetspeed.security.SecurityException.UNEXPECTED = {1} \u304b\u3089 {0} \u3067\u4e88\u671f\u3057\u306a\u3044\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30a8\u30e9\u30fc: {2}
org.apache.jetspeed.security.SecurityException.INVALID_UID = UID\u306f\u6b63\u898f\u8868\u73fe\u306e\u30e1\u30bf\u30ad\u30e3\u30e9\u30af\u30bf\u3001null\u3001\u307e\u305f\u306f\u7a7a\u306b\u3067\u304d\u307e\u305b\u3093\u3002
org.apache.jetspeed.security.SecurityException.INVALID_DN = DN\u306f null \u307e\u305f\u306f\u7a7a\u306b\u3067\u304d\u307e\u305b\u3093\u3002
+
+# resource strings for specific principal, user
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ALREADY_EXISTS = The user {0} already exists.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_IS_READ_ONLY = The user {0} is read-only.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_UPDATE_FAILURE = Failed to update user {0}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_NOT_REMOVABLE = The user {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.user.DEPENDENT_PRINCIPAL_EXISTS = The user {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = The user association to {0} is required.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The user association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The user association to {0} is not supported.
+
+# resource strings for specific principal, role
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ALREADY_EXISTS = The role {0} already exists.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_IS_READ_ONLY = The role {0} is read-only.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_UPDATE_FAILURE = Failed to update role {0}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_NOT_REMOVABLE = The role {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.role.DEPENDENT_PRINCIPAL_EXISTS = The role {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = The role association to {0} is required.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The role association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The role association to {0} is not supported.
+
+# resource strings for specific principal, group
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ALREADY_EXISTS = The group {0} already exists.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_IS_READ_ONLY = The group {0} is read-only.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_UPDATE_FAILURE = Failed to update group {0}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_NOT_REMOVABLE = The group {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.group.DEPENDENT_PRINCIPAL_EXISTS = The group {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = The group association to {0} is required.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The group association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The group association to {0} is not supported.
\ No newline at end of file
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties?rev=693867&r1=693866&r2=693867&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties Wed Sep 10 08:16:51 2008
@@ -14,6 +14,14 @@
# limitations under the License.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_DOES_NOT_EXIST = principal {0} \uc774 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ALREADY_EXISTS = The principal {0} already exists.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_IS_READ_ONLY = The principal {0} is read-only.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_UPDATE_FAILURE = Failed to update principal {0}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_NOT_REMOVABLE = The principal {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.DEPENDENT_PRINCIPAL_EXISTS = The principal {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = The principal association to {0} is required.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The principal association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The principal association to {0} is not supported.
org.apache.jetspeed.security.SecurityException.PERMISSION_DOES_NOT_EXIST = permission {0} \uc774 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = \uc0ac\uc6a9\uc790, {0} \uc740 \uc774\ubbf8 \uc874\uc7ac\ud569\ub2c8\ub2e4.
org.apache.jetspeed.security.SecurityException.USER_DOES_NOT_EXIST = \uc0ac\uc6a9\uc790, {0} \uc740 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
@@ -32,3 +40,33 @@
org.apache.jetspeed.security.SecurityException.UNEXPECTED = \uc608\uae30\uce58 \uc54a\uc740 \ubcf4\uc548 \uc624\ub958\uc785\ub2c8\ub2e4: at {0} from {1}: {2}
org.apache.jetspeed.security.SecurityException.INVALID_UID = UID\ub294 \uc815\uaddc\uc2dd \ud45c\ud604\uc774\ub098 \uba54\ud0c0 \ubb38\uc790\uac00 \ud3ec\ud568\ub420 \uc218 \uc5c6\uc73c\uba70, \ub110 \uac12\uc774\uac70\ub098 \ube48 \uac12\uc774\uba74 \uc548\ub429\ub2c8\ub2e4.
org.apache.jetspeed.security.SecurityException.INVALID_DN = DN\uc740 \ub110 \uac12\uc774\uac70\ub098 \ube48 \uac12\uc77c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
+
+# resource strings for specific principal, user
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ALREADY_EXISTS = The user {0} already exists.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_IS_READ_ONLY = The user {0} is read-only.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_UPDATE_FAILURE = Failed to update user {0}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_NOT_REMOVABLE = The user {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.user.DEPENDENT_PRINCIPAL_EXISTS = The user {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = The user association to {0} is required.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The user association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The user association to {0} is not supported.
+
+# resource strings for specific principal, role
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ALREADY_EXISTS = The role {0} already exists.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_IS_READ_ONLY = The role {0} is read-only.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_UPDATE_FAILURE = Failed to update role {0}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_NOT_REMOVABLE = The role {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.role.DEPENDENT_PRINCIPAL_EXISTS = The role {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = The role association to {0} is required.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The role association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The role association to {0} is not supported.
+
+# resource strings for specific principal, group
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ALREADY_EXISTS = The group {0} already exists.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_IS_READ_ONLY = The group {0} is read-only.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_UPDATE_FAILURE = Failed to update group {0}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_NOT_REMOVABLE = The group {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.group.DEPENDENT_PRINCIPAL_EXISTS = The group {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = The group association to {0} is required.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The group association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The group association to {0} is not supported.
\ No newline at end of file
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties?rev=693867&r1=693866&r2=693867&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties Wed Sep 10 08:16:51 2008
@@ -14,6 +14,14 @@
# limitations under the License.
# org.apache.jetspeed.security.SecurityException.PRINCIPAL_DOES_NOT_EXIST = The principal {0} does not exist.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ALREADY_EXISTS = The principal {0} already exists.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_IS_READ_ONLY = The principal {0} is read-only.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_UPDATE_FAILURE = Failed to update principal {0}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_NOT_REMOVABLE = The principal {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.DEPENDENT_PRINCIPAL_EXISTS = The principal {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = The principal association to {0} is required.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The principal association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The principal association to {0} is not supported.
org.apache.jetspeed.security.SecurityException.PERMISSION_DOES_NOT_EXIST = Permission {0} bestaat niet.
org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = De gebruiker {0} bestaat al.
org.apache.jetspeed.security.SecurityException.USER_DOES_NOT_EXIST = De gebruiker {0} bestaat niet.
@@ -33,3 +41,32 @@
# org.apache.jetspeed.security.SecurityException.INVALID_UID = The uid cannot contain any regular expression meta-characters or be null or be empty.
# org.apache.jetspeed.security.SecurityException.INVALID_DN = The dn cannot be null or empty.
+# resource strings for specific principal, user
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ALREADY_EXISTS = The user {0} already exists.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_IS_READ_ONLY = The user {0} is read-only.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_UPDATE_FAILURE = Failed to update user {0}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_NOT_REMOVABLE = The user {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.user.DEPENDENT_PRINCIPAL_EXISTS = The user {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = The user association to {0} is required.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The user association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The user association to {0} is not supported.
+
+# resource strings for specific principal, role
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ALREADY_EXISTS = The role {0} already exists.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_IS_READ_ONLY = The role {0} is read-only.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_UPDATE_FAILURE = Failed to update role {0}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_NOT_REMOVABLE = The role {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.role.DEPENDENT_PRINCIPAL_EXISTS = The role {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = The role association to {0} is required.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The role association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The role association to {0} is not supported.
+
+# resource strings for specific principal, group
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ALREADY_EXISTS = The group {0} already exists.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_IS_READ_ONLY = The group {0} is read-only.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_UPDATE_FAILURE = Failed to update group {0}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_NOT_REMOVABLE = The group {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.group.DEPENDENT_PRINCIPAL_EXISTS = The group {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = The group association to {0} is required.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The group association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The group association to {0} is not supported.
\ No newline at end of file
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties?rev=693867&r1=693866&r2=693867&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties Wed Sep 10 08:16:51 2008
@@ -14,6 +14,14 @@
# limitations under the License.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_DOES_NOT_EXIST = \u041f\u0440\u0438\u043d\u0446\u0438\u043f\u0430\u043b\u0430 {0} \u043d\u0435 \u0456\u0441\u043d\u0443\u0454.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ALREADY_EXISTS = The principal {0} already exists.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_IS_READ_ONLY = The principal {0} is read-only.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_UPDATE_FAILURE = Failed to update principal {0}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_NOT_REMOVABLE = The principal {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.DEPENDENT_PRINCIPAL_EXISTS = The principal {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = The principal association to {0} is required.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The principal association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The principal association to {0} is not supported.
org.apache.jetspeed.security.SecurityException.PERMISSION_DOES_NOT_EXIST = \u0414\u043e\u0437\u0432\u043e\u043b\u0443 {0} \u043d\u0435 \u0456\u0441\u043d\u0443\u0454.
org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = \u041a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447 {0} \u0432\u0436\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
org.apache.jetspeed.security.SecurityException.USER_DOES_NOT_EXIST = \u041a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0430 {0} \u043d\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
@@ -32,3 +40,33 @@
org.apache.jetspeed.security.SecurityException.UNEXPECTED = \u041d\u0435\u043e\u0447\u0456\u043a\u0443\u0432\u0430\u043d\u0430 \u043f\u043e\u043c\u0438\u043b\u043a\u0430 \u0431\u0435\u0437\u043f\u0435\u043a\u0438 \u043d\u0430 {0} \u0437 {1}: {2}
org.apache.jetspeed.security.SecurityException.INVALID_UID = uid \u043d\u0435 \u043c\u043e\u0436\u0435 \u043c\u0456\u0441\u0442\u0438\u0442\u0438 \u043c\u0435\u0442\u0430\u0441\u0438\u043c\u0432\u043e\u043b\u0438 \u0441\u0442\u0430\u043b\u043e\u0433\u043e \u0432\u0438\u0440\u0430\u0437\u0443, \u0430 \u0442\u0430\u043a\u043e\u0436 \u0431\u0443\u0442\u0438 null \u0430\u0431\u043e \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u043c.
org.apache.jetspeed.security.SecurityException.INVALID_DN = dn \u043d\u0435 \u043c\u043e\u0436\u0435 \u0431\u0443\u0442\u0438 null \u0430\u0431\u043e \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u043c.
+
+# resource strings for specific principal, user
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ALREADY_EXISTS = The user {0} already exists.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_IS_READ_ONLY = The user {0} is read-only.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_UPDATE_FAILURE = Failed to update user {0}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_NOT_REMOVABLE = The user {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.user.DEPENDENT_PRINCIPAL_EXISTS = The user {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = The user association to {0} is required.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The user association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The user association to {0} is not supported.
+
+# resource strings for specific principal, role
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ALREADY_EXISTS = The role {0} already exists.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_IS_READ_ONLY = The role {0} is read-only.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_UPDATE_FAILURE = Failed to update role {0}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_NOT_REMOVABLE = The role {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.role.DEPENDENT_PRINCIPAL_EXISTS = The role {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = The role association to {0} is required.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The role association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The role association to {0} is not supported.
+
+# resource strings for specific principal, group
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ALREADY_EXISTS = The group {0} already exists.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_IS_READ_ONLY = The group {0} is read-only.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_UPDATE_FAILURE = Failed to update group {0}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_NOT_REMOVABLE = The group {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.group.DEPENDENT_PRINCIPAL_EXISTS = The group {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = The group association to {0} is required.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The group association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The group association to {0} is not supported.
\ No newline at end of file
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties?rev=693867&r1=693866&r2=693867&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties Wed Sep 10 08:16:51 2008
@@ -14,6 +14,14 @@
# limitations under the License.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_DOES_NOT_EXIST = \u7528\u6237 {0} \u4e0d\u5b58\u5728.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ALREADY_EXISTS = The principal {0} already exists.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_IS_READ_ONLY = The principal {0} is read-only.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_UPDATE_FAILURE = Failed to update principal {0}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_NOT_REMOVABLE = The principal {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.DEPENDENT_PRINCIPAL_EXISTS = The principal {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = The principal association to {0} is required.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The principal association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The principal association to {0} is not supported.
org.apache.jetspeed.security.SecurityException.PERMISSION_DOES_NOT_EXIST = \u8bb8\u53ef\u8bc1 {0} \u4e0d\u5b58\u5728.
org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = \u7528\u6237 {0} \u5df2\u5b58\u5728.
org.apache.jetspeed.security.SecurityException.USER_DOES_NOT_EXIST = \u7528\u6237 {0} \u4e0d\u5b58\u5728.
@@ -32,3 +40,33 @@
org.apache.jetspeed.security.SecurityException.UNEXPECTED = \u610f\u5916\u7684\u5b89\u5168\u9519\u8bef {0} \u4ece {1}: {2}
org.apache.jetspeed.security.SecurityException.INVALID_UID = uid\u4e0d\u80fd\u4e3a\u7a7a\u5b57\u7b26\u4e32, null\u6216\u5305\u542b\u4efb\u4f55\u6b63\u5219\u8868\u8fbe\u5f0f\u4e13\u7528\u5b57\u7b26.
org.apache.jetspeed.security.SecurityException.INVALID_DN = dn\u4e0d\u80fd\u4e3a\u7a7a\u5b57\u7b26\u4e32\u6216\u4e3anull.
+
+# resource strings for specific principal, user
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ALREADY_EXISTS = The user {0} already exists.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_IS_READ_ONLY = The user {0} is read-only.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_UPDATE_FAILURE = Failed to update user {0}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_NOT_REMOVABLE = The user {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.user.DEPENDENT_PRINCIPAL_EXISTS = The user {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = The user association to {0} is required.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The user association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The user association to {0} is not supported.
+
+# resource strings for specific principal, role
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ALREADY_EXISTS = The role {0} already exists.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_IS_READ_ONLY = The role {0} is read-only.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_UPDATE_FAILURE = Failed to update role {0}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_NOT_REMOVABLE = The role {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.role.DEPENDENT_PRINCIPAL_EXISTS = The role {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = The role association to {0} is required.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The role association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The role association to {0} is not supported.
+
+# resource strings for specific principal, group
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ALREADY_EXISTS = The group {0} already exists.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_IS_READ_ONLY = The group {0} is read-only.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_UPDATE_FAILURE = Failed to update group {0}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_NOT_REMOVABLE = The group {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.group.DEPENDENT_PRINCIPAL_EXISTS = The group {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = The group association to {0} is required.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The group association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The group association to {0} is not supported.
\ No newline at end of file
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties?rev=693867&r1=693866&r2=693867&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties Wed Sep 10 08:16:51 2008
@@ -14,6 +14,14 @@
# limitations under the License.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_DOES_NOT_EXIST = \u4f7f\u7528\u8005 {0} \u4e0d\u5b58\u5728.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ALREADY_EXISTS = The principal {0} already exists.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_IS_READ_ONLY = The principal {0} is read-only.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_UPDATE_FAILURE = Failed to update principal {0}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_NOT_REMOVABLE = The principal {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.DEPENDENT_PRINCIPAL_EXISTS = The principal {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = The principal association to {0} is required.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The principal association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The principal association to {0} is not supported.
org.apache.jetspeed.security.SecurityException.PERMISSION_DOES_NOT_EXIST = \u8a31\u53ef\u6b0a {0} \u4e0d\u5b58\u5728.
org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = \u4f7f\u7528\u8005 {0} \u5df2\u5b58\u5728.
org.apache.jetspeed.security.SecurityException.USER_DOES_NOT_EXIST = \u4f7f\u7528\u8005 {0} \u4e0d\u5b58\u5728.
@@ -32,3 +40,33 @@
org.apache.jetspeed.security.SecurityException.UNEXPECTED = \u610f\u5916\u7684\u5b89\u5168\u932f\u8aa4 {0} \u5728 {1}: {2}
org.apache.jetspeed.security.SecurityException.INVALID_UID = uid\u4e0d\u80fd\u70ba\u7a7a\u5b57\u4e32, null\u6216\u5305\u542b\u4efb\u4f55\u5e38\u898f\u8868\u793a\u5f0f\u8b8a\u5316\u7528\u5b57\u5143.
org.apache.jetspeed.security.SecurityException.INVALID_DN = dn\u4e0d\u80fd\u70ba\u7a7a\u5b57\u4e32\u6216\u662fnull.
+
+# resource strings for specific principal, user
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ALREADY_EXISTS = The user {0} already exists.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_IS_READ_ONLY = The user {0} is read-only.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_UPDATE_FAILURE = Failed to update user {0}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_NOT_REMOVABLE = The user {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.user.DEPENDENT_PRINCIPAL_EXISTS = The user {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = The user association to {0} is required.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The user association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The user association to {0} is not supported.
+
+# resource strings for specific principal, role
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ALREADY_EXISTS = The role {0} already exists.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_IS_READ_ONLY = The role {0} is read-only.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_UPDATE_FAILURE = Failed to update role {0}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_NOT_REMOVABLE = The role {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.role.DEPENDENT_PRINCIPAL_EXISTS = The role {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = The role association to {0} is required.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The role association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The role association to {0} is not supported.
+
+# resource strings for specific principal, group
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ALREADY_EXISTS = The group {0} already exists.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_IS_READ_ONLY = The group {0} is read-only.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_UPDATE_FAILURE = Failed to update group {0}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_NOT_REMOVABLE = The group {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.group.DEPENDENT_PRINCIPAL_EXISTS = The group {0} has one or more dependents.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = The group association to {0} is required.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_NOT_ALLOWED = The group association to {0} is not allowed.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = The group association to {0} is not supported.
\ No newline at end of file
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java?rev=693867&r1=693866&r2=693867&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java Wed Sep 10 08:16:51 2008
@@ -48,10 +48,10 @@
public static final KeyedMessage DEPENDENT_PRINCIPAL_EXISTS = new KeyedMessage("The principal {0} has one or more dependents.");
/** <p>Principal association required exception message.</p> */
- public static final KeyedMessage PRINCIPAL_ASSOCIATION_REQUIRED = new KeyedMessage("The pricipal association to {0} is required.");
+ public static final KeyedMessage PRINCIPAL_ASSOCIATION_REQUIRED = new KeyedMessage("The principal association to {0} is required.");
/** <p>Principal association is not allowed exception message.</p> */
- public static final KeyedMessage PRINCIPAL_ASSOCIATION_NOT_ALLOWED = new KeyedMessage("The pricipal association to {0} is not allowed.");
+ public static final KeyedMessage PRINCIPAL_ASSOCIATION_NOT_ALLOWED = new KeyedMessage("The principal association to {0} is not allowed.");
/** <p>Principal association is not supported exception message.</p> */
public static final KeyedMessage PRINCIPAL_ASSOCIATION_UNSUPPORTED = new KeyedMessage("The principal association to {0} is not supported.");
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org