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 at...@apache.org on 2008/10/08 21:51:46 UTC
svn commit: r702978 - in
/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade:
components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/
components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/d...
Author: ate
Date: Wed Oct 8 12:51:45 2008
New Revision: 702978
URL: http://svn.apache.org/viewvc?rev=702978&view=rev
Log:
Fixing some incorrect usages and definitions of KeyedMessages
Modified:
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/LdapAuthenticationProvider.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/AttributeBasedRelationDAO.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/LdapAuthenticationProvider.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/LdapAuthenticationProvider.java?rev=702978&r1=702977&r2=702978&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/LdapAuthenticationProvider.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/LdapAuthenticationProvider.java Wed Oct 8 12:51:45 2008
@@ -144,7 +144,7 @@
}
catch (NamingException nex)
{
- throw new SecurityException(SecurityException.UNEXPECTED.createScoped("in logining in",JetspeedPrincipalType.USER,userName));
+ throw new SecurityException(SecurityException.UNEXPECTED.create(getClass().getName(),"authenticateUser", nex.getMessage()));
}
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/AttributeBasedRelationDAO.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/AttributeBasedRelationDAO.java?rev=702978&r1=702977&r2=702978&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/AttributeBasedRelationDAO.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/AttributeBasedRelationDAO.java Wed Oct 8 12:51:45 2008
@@ -150,11 +150,15 @@
}
Attribute relationAttribute = fromEntity.getAttribute(this.relationAttribute);
- if(relationAttribute == null){
+ if(relationAttribute == null)
+ {
fromEntity.setAttribute(this.relationAttribute,new ArrayList<String>());
- }else{
- if(relationAttribute.getValues().contains(attrValue)){
- throw new SecurityException(SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS.createScoped(fromEntity.getId(),toEntity.getId()));
+ }
+ else
+ {
+ if(relationAttribute.getValues().contains(attrValue))
+ {
+ throw new SecurityException(SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS.createScoped(fromEntity.getType(), fromEntity.getId(), relationAttribute, toEntity.getId()));
}
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties?rev=702978&r1=702977&r2=702978&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties Wed Oct 8 12:51:45 2008
@@ -20,7 +20,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = A {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A {0} {1} association is not allowed.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another {2}.
@@ -61,7 +61,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The user {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = A user {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A user {0} {1} association is not allowed.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from user {1} to another user.
@@ -80,7 +80,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The role {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = A role {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A role {0} {1} association is not allowed.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from role {1} to another role.
@@ -99,7 +99,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The group {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = A group {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A group {0} {1} association is not supported.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another group.
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties?rev=702978&r1=702977&r2=702978&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties Wed Oct 8 12:51:45 2008
@@ -19,7 +19,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = A {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A {0} {1} association is not allowed.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another {2}.
@@ -60,7 +60,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The user {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = A user {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A user {0} {1} association is not allowed.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from user {1} to another user.
@@ -79,7 +79,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The role {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = A role {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A role {0} {1} association is not allowed.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from role {1} to another role.
@@ -98,7 +98,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The group {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = A group {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A group {0} {1} association is not supported.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another group.
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties?rev=702978&r1=702977&r2=702978&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties Wed Oct 8 12:51:45 2008
@@ -19,7 +19,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = A {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A {0} {1} association is not allowed.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another {2}.
@@ -60,7 +60,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The user {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = A user {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A user {0} {1} association is not supported.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from user {1} to another user.
@@ -79,7 +79,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The role {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = A role {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A role {0} {1} association is not supported.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from role {1} to another role.
@@ -98,7 +98,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The group {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = A group {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A group {0} {1} association is not supported.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another group.
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties?rev=702978&r1=702977&r2=702978&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties Wed Oct 8 12:51:45 2008
@@ -19,7 +19,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = A {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A {0} {1} association is not allowed.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another {2}.
@@ -60,7 +60,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The user {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = A user {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A user {0} {1} association is not supported.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from user {1} to another user.
@@ -79,7 +79,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The role {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = A role {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A role {0} {1} association is not supported.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from role {1} to another role.
@@ -98,7 +98,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The group {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = A group {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A group {0} {1} association is not supported.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another group.
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties?rev=702978&r1=702977&r2=702978&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties Wed Oct 8 12:51:45 2008
@@ -19,7 +19,7 @@
org.apache.jetspeed.security.SecurityException.PRINCIPAL_UPDATE_FAILURE = Opslaan van de principal {0} is mislukt.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_NOT_REMOVABLE = De principal {0} mag niet worden verwijderd.
org.apache.jetspeed.security.SecurityException.DEPENDENT_PRINCIPAL_EXISTS = De principal {0} heeft een of meer veplichte {1} {2} koppelingen.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = De principal {0} heeft al een koppeling met {1}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = De principal {0} heeft al een {1} koppeling met {2}.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = Een {0} {1} koppeling is vereist.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = Een {0} {1} koppeling is niet mogelijk.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR = Slechts een {0} koppeling is toegestaan van principal {1} naar een andere {2}.
@@ -60,7 +60,7 @@
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_UPDATE_FAILURE = Opslaan van de gebruiker {0} is mislukt.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_NOT_REMOVABLE = De gebruiker {0} mag niet worden verwijderd.
org.apache.jetspeed.security.SecurityException.user.DEPENDENT_PRINCIPAL_EXISTS = De gebruiker {0} heeft een of meer verplichte {1} {2} koppelingen.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = De principal {0} heeft al een koppeling met {1}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = De gebruiker {0} heeft al een {1} koppeling met {2}.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = Een user {0} {1} koppeling is vereist.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = Een user {0} {1} koppeling is niet mogelijk.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR = Slechts een {0} koppeling is toegestaan van gebruiker {1} naar een andere gebruiker.
@@ -79,7 +79,7 @@
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_UPDATE_FAILURE = Opslaan van de rol {0} is mislukt.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_NOT_REMOVABLE = De rol {0} mag niet worden verwijderd.
org.apache.jetspeed.security.SecurityException.role.DEPENDENT_PRINCIPAL_EXISTS = De rol {0} heeft een of meer verplichte {1} {2} koppelingen.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = De principal {0} heeft al een koppeling met {1}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = De role {0} heeft al een {1} koppeling met {2}.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = Een role {0} {1} koppeling is vereist.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = Een role {0} {1} koppeling is niet mogelijk.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR = Slechts een {0} koppeling is toegestaan van rol {1} naar een andere rol.
@@ -98,7 +98,7 @@
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_UPDATE_FAILURE = Opslaan van de groep {0} is mislukt.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_NOT_REMOVABLE = De groep {0} mag niet worden verwijderd.
org.apache.jetspeed.security.SecurityException.group.DEPENDENT_PRINCIPAL_EXISTS = De groep {0} heeft een of meer verplichte {1} {2} koppelingen.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = De principal {0} heeft al een koppeling met {1}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = De groep {0} heeft al een {1} koppeling met {2}.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = Een group {0} {1} koppeling is vereist.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = Een group {0} {1} koppeling is niet mogelijk.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR = Slechts een {0} koppeling is toegestaan van groep {1} naar een andere groep.
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties?rev=702978&r1=702977&r2=702978&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties Wed Oct 8 12:51:45 2008
@@ -19,7 +19,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = A {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A {0} {1} association is not allowed.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another {2}.
@@ -60,7 +60,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The user {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = A user {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A user {0} {1} association is not supported.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from user {1} to another user.
@@ -79,7 +79,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The role {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = A role {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A role {0} {1} association is not supported.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from role {1} to another role.
@@ -98,7 +98,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The group {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = A group {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A group {0} {1} association is not supported.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another group.
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties?rev=702978&r1=702977&r2=702978&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties Wed Oct 8 12:51:45 2008
@@ -19,7 +19,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = A {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A {0} {1} association is not allowed.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another {2}.
@@ -60,7 +60,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The user {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = A user {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A user {0} {1} association is not supported.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from user {1} to another user.
@@ -79,7 +79,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The role {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = A role {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A role {0} {1} association is not supported.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from role {1} to another role.
@@ -98,7 +98,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The group {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = A group {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A group {0} {1} association is not supported.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another group.
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties?rev=702978&r1=702977&r2=702978&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties Wed Oct 8 12:51:45 2008
@@ -19,7 +19,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = A {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A {0} {1} association is not allowed.
org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another {2}.
@@ -60,7 +60,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The user {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = A user {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A user {0} {1} association is not supported.
org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from user {1} to another user.
@@ -79,7 +79,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The role {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = A role {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A role {0} {1} association is not supported.
org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from role {1} to another role.
@@ -98,7 +98,7 @@
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 required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The group {0} already has a {1} association with {2}.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = A group {0} {1} association is required.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A group {0} {1} association is not supported.
org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another group.
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java?rev=702978&r1=702977&r2=702978&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java Wed Oct 8 12:51:45 2008
@@ -63,7 +63,7 @@
public static final KeyedMessage PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = new KeyedMessage("Only one {0} association is allowed to principal {1} from a {2}.");
/** <p>Principal association already exist with principal</p> */
- public static final KeyedMessage PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = new KeyedMessage("Principal {0} already has association with {1}.");
+ public static final KeyedMessage PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = new KeyedMessage("Principal {0} already has a {1} association with {2}.");
/** <p>Principal association is not supported exception message.</p> */
public static final KeyedMessage PRINCIPAL_ASSOCIATION_UNSUPPORTED = new KeyedMessage("A {0} {1} association is not supported.");
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org