svn commit: r1416991 - in /archiva/redback/redback-core/trunk/redback-integrations/redback-rest: redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/ redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/

[olamy]

Author: olamy
Date: Tue Dec  4 15:26:55 2012
New Revision: 1416991

URL: http://svn.apache.org/viewvc?rev=1416991&view=rev
Log:
authenticator do not return key so add a message field

Modified:
    
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/ErrorMessage.java
    
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLoginService.java

Modified: 
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/ErrorMessage.java
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/ErrorMessage.java?rev=1416991&r1=1416990&r2=1416991&view=diff
==============================================================================
--- 
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/ErrorMessage.java
 (original)
+++ 
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/ErrorMessage.java
 Tue Dec  4 15:26:55 2012
@@ -33,6 +33,11 @@ public class ErrorMessage
 
     private String[] args;
 
+    /**
+     * @since 2.1 for message without any key
+     */
+    private String message;
+
     private static final String[] EMPTY = new String[0];
 
     public ErrorMessage()
@@ -71,4 +76,20 @@ public class ErrorMessage
     {
         this.args = args;
     }
+
+    public String getMessage()
+    {
+        return message;
+    }
+
+    public void setMessage( String message )
+    {
+        this.message = message;
+    }
+
+    public ErrorMessage message( String message )
+    {
+        this.message = message;
+        return this;
+    }
 }

Modified: 
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLoginService.java
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLoginService.java?rev=1416991&r1=1416990&r2=1416991&view=diff
==============================================================================
--- 
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLoginService.java
 (original)
+++ 
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLoginService.java
 Tue Dec  4 15:26:55 2012
@@ -155,7 +155,7 @@ public class DefaultLoginService
                 List<ErrorMessage> errorMessages = new 
ArrayList<ErrorMessage>();
                 for ( Map.Entry<String, String> entry : 
securitySession.getAuthenticationResult().getExceptionsMap().entrySet() )
                 {
-                    errorMessages.add( new ErrorMessage( entry.getValue() ) );
+                    errorMessages.add( new ErrorMessage().message( 
entry.getValue() ) );
                 }
 
                 throw new RedbackServiceException( errorMessages );