portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r702979 - in /portals/jetspeed-2/portal/trunk: components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/ components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/ jetspeed-api/src/mai...
Date Wed, 08 Oct 2008 20:00:56 GMT
Author: ate
Date: Wed Oct  8 13:00:54 2008
New Revision: 702979

URL: http://svn.apache.org/viewvc?rev=702979&view=rev
Log:
Fixing some incorrect usages and definitions of KeyedMessages

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/LdapAuthenticationProvider.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/AttributeBasedRelationDAO.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/LdapAuthenticationProvider.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/LdapAuthenticationProvider.java?rev=702979&r1=702978&r2=702979&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/LdapAuthenticationProvider.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/LdapAuthenticationProvider.java Wed Oct  8 13:00:54 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/trunk/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/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/AttributeBasedRelationDAO.java?rev=702979&r1=702978&r2=702979&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/AttributeBasedRelationDAO.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/AttributeBasedRelationDAO.java Wed Oct  8 13:00:54 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/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties?rev=702979&r1=702978&r2=702979&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties Wed Oct  8 13:00:54 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/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties?rev=702979&r1=702978&r2=702979&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties Wed Oct  8 13:00:54 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/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties?rev=702979&r1=702978&r2=702979&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties Wed Oct  8 13:00:54 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/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties?rev=702979&r1=702978&r2=702979&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties Wed Oct  8 13:00:54 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/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties?rev=702979&r1=702978&r2=702979&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties Wed Oct  8 13:00:54 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/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties?rev=702979&r1=702978&r2=702979&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties Wed Oct  8 13:00:54 2008
@@ -13,13 +13,13 @@
 # See the License for the specific language governing permissions and
 # 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_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 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}.
@@ -31,19 +31,19 @@
 org.apache.jetspeed.security.SecurityException.ATTRIBUTES_ARE_READ_ONLY = The principal attributes are read only.
 org.apache.jetspeed.security.SecurityException.ATTRIBUTE_NOT_EXTENDABLE = Adding new principal attributes 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.PERMISSION_DOES_NOT_EXIST = \u0414\u043e\u0437\u0432\u043e\u043b\u0443 {0} \u043d\u0435 \u0456\u0441\u043d\u0443\u0454.
 org.apache.jetspeed.security.SecurityException.PERMISSION_ALREADY_EXISTS = The permission {0} already exists.
-org.apache.jetspeed.security.SecurityException.EMPTY_PARAMETER = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 null \u0430\u0431\u043e \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u0439 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440 {0}.
-org.apache.jetspeed.security.SecurityException.INVALID_PASSWORD = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 \u043f\u0430\u0440\u043e\u043b\u044c.
-org.apache.jetspeed.security.SecurityException.INVALID_NEW_PASSWORD = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 \u043d\u043e\u0432\u0438\u0439 \u043f\u0430\u0440\u043e\u043b\u044c.
-org.apache.jetspeed.security.SecurityException.INCORRECT_PASSWORD = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 \u043f\u0430\u0440\u043e\u043b\u044c.
-org.apache.jetspeed.security.SecurityException.PASSWORD_REQUIRED = \u041d\u0435\u043e\u0431\u0445\u0456\u0434\u043d\u043e \u0432\u0432\u0435\u0441\u0442\u0438 \u043f\u0430\u0440\u043e\u043b\u044c.
-org.apache.jetspeed.security.SecurityException.INVALID_AUTHENTICATION_PROVIDER = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 \u043f\u0440\u043e\u0432\u0430\u0439\u0434\u0435\u0440 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0456\u043a\u0430\u0446\u0456\u0457 {0}.
-org.apache.jetspeed.security.SecurityException.PASSWORD_ALREADY_USED = \u041f\u0430\u0440\u043e\u043b\u044c \u0432\u0436\u0435 \u0432\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u043e\u0432\u0443\u0454\u0442\u044c\u0441\u044f.
-org.apache.jetspeed.security.SecurityException.ANONYMOUS_USER_PROTECTED = \u041a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447 {0} \u0437\u0430\u0445\u0438\u0449\u0435\u043d\u0438\u0439.
-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.
+org.apache.jetspeed.security.SecurityException.EMPTY_PARAMETER = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 null \u0430\u0431\u043e \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u0439 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440 {0}.
+org.apache.jetspeed.security.SecurityException.INVALID_PASSWORD = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 \u043f\u0430\u0440\u043e\u043b\u044c.
+org.apache.jetspeed.security.SecurityException.INVALID_NEW_PASSWORD = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 \u043d\u043e\u0432\u0438\u0439 \u043f\u0430\u0440\u043e\u043b\u044c.
+org.apache.jetspeed.security.SecurityException.INCORRECT_PASSWORD = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 \u043f\u0430\u0440\u043e\u043b\u044c.
+org.apache.jetspeed.security.SecurityException.PASSWORD_REQUIRED = \u041d\u0435\u043e\u0431\u0445\u0456\u0434\u043d\u043e \u0432\u0432\u0435\u0441\u0442\u0438 \u043f\u0430\u0440\u043e\u043b\u044c.
+org.apache.jetspeed.security.SecurityException.INVALID_AUTHENTICATION_PROVIDER = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 \u043f\u0440\u043e\u0432\u0430\u0439\u0434\u0435\u0440 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0456\u043a\u0430\u0446\u0456\u0457 {0}.
+org.apache.jetspeed.security.SecurityException.PASSWORD_ALREADY_USED = \u041f\u0430\u0440\u043e\u043b\u044c \u0432\u0436\u0435 \u0432\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u043e\u0432\u0443\u0454\u0442\u044c\u0441\u044f.
+org.apache.jetspeed.security.SecurityException.ANONYMOUS_USER_PROTECTED = \u041a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447 {0} \u0437\u0430\u0445\u0438\u0449\u0435\u043d\u0438\u0439.
+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.
 
 #### deprecated resource strings: see SecurityException #####
 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.
@@ -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/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties?rev=702979&r1=702978&r2=702979&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties Wed Oct  8 13:00:54 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/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties?rev=702979&r1=702978&r2=702979&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties Wed Oct  8 13:00:54 2008
@@ -13,13 +13,13 @@
 # See the License for the specific language governing permissions and
 # 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_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 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}.
@@ -31,19 +31,19 @@
 org.apache.jetspeed.security.SecurityException.ATTRIBUTES_ARE_READ_ONLY = The principal attributes are read only.
 org.apache.jetspeed.security.SecurityException.ATTRIBUTE_NOT_EXTENDABLE = Adding new principal attributes is not supported.
 
-org.apache.jetspeed.security.SecurityException.PERMISSION_DOES_NOT_EXIST = \u8a31\u53ef\u6b0a {0} \u4e0d\u5b58\u5728. 
+org.apache.jetspeed.security.SecurityException.PERMISSION_DOES_NOT_EXIST = \u8a31\u53ef\u6b0a {0} \u4e0d\u5b58\u5728. 
 org.apache.jetspeed.security.SecurityException.PERMISSION_ALREADY_EXISTS = The permission {0} already exists.
-org.apache.jetspeed.security.SecurityException.EMPTY_PARAMETER = \u4e0d\u5408\u6cd5\u7684null\u6216\u7a7a\u53c3\u6578 {0}. 
-org.apache.jetspeed.security.SecurityException.INVALID_PASSWORD = \u5bc6\u78bc\u4e0d\u53ef\u7528.
-org.apache.jetspeed.security.SecurityException.INVALID_NEW_PASSWORD = \u65b0\u5bc6\u78bc\u4e0d\u53ef\u7528. 
-org.apache.jetspeed.security.SecurityException.INCORRECT_PASSWORD = \u4e0d\u6b63\u78ba\u5bc6\u78bc. 
-org.apache.jetspeed.security.SecurityException.PASSWORD_REQUIRED = \u9700\u8981\u8f38\u5165\u5bc6\u78bc. 
-org.apache.jetspeed.security.SecurityException.INVALID_AUTHENTICATION_PROVIDER = \u9a57\u8b49\u63d0\u4f9b\u5668 {0} \u4e0d\u53ef\u7528. 
-org.apache.jetspeed.security.SecurityException.PASSWORD_ALREADY_USED = \u5bc6\u78bc\u5df2\u4f7f\u7528. 
-org.apache.jetspeed.security.SecurityException.ANONYMOUS_USER_PROTECTED = \u4f7f\u7528\u8005 {0} \u53d7\u4fdd\u8b77. 
-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. 
+org.apache.jetspeed.security.SecurityException.EMPTY_PARAMETER = \u4e0d\u5408\u6cd5\u7684null\u6216\u7a7a\u53c3\u6578 {0}. 
+org.apache.jetspeed.security.SecurityException.INVALID_PASSWORD = \u5bc6\u78bc\u4e0d\u53ef\u7528.
+org.apache.jetspeed.security.SecurityException.INVALID_NEW_PASSWORD = \u65b0\u5bc6\u78bc\u4e0d\u53ef\u7528. 
+org.apache.jetspeed.security.SecurityException.INCORRECT_PASSWORD = \u4e0d\u6b63\u78ba\u5bc6\u78bc. 
+org.apache.jetspeed.security.SecurityException.PASSWORD_REQUIRED = \u9700\u8981\u8f38\u5165\u5bc6\u78bc. 
+org.apache.jetspeed.security.SecurityException.INVALID_AUTHENTICATION_PROVIDER = \u9a57\u8b49\u63d0\u4f9b\u5668 {0} \u4e0d\u53ef\u7528. 
+org.apache.jetspeed.security.SecurityException.PASSWORD_ALREADY_USED = \u5bc6\u78bc\u5df2\u4f7f\u7528. 
+org.apache.jetspeed.security.SecurityException.ANONYMOUS_USER_PROTECTED = \u4f7f\u7528\u8005 {0} \u53d7\u4fdd\u8b77. 
+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. 
 
 #### deprecated resource strings: see SecurityException #####
 org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = \u4f7f\u7528\u8005 {0} \u5df2\u5b58\u5728. 
@@ -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/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java?rev=702979&r1=702978&r2=702979&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java Wed Oct  8 13:00:54 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


Mime
View raw message