svn commit: r1577042 - in /syncope/branches/1_1_X: client/src/main/java/org/apache/syncope/client/http/ console/src/main/java/org/apache/syncope/console/pages/ core/src/test/java/org/apache/syncope/core/rest/

[ilgrosso]

Author: ilgrosso
Date: Thu Mar 13 07:11:21 2014
New Revision: 1577042

URL: http://svn.apache.org/r1577042
Log:
[SYNCOPE-484] Patch applied, thanks

Modified:
    
syncope/branches/1_1_X/client/src/main/java/org/apache/syncope/client/http/PreemptiveAuthHttpRequestFactory.java
    
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/Login.java
    
syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java

Modified: 
syncope/branches/1_1_X/client/src/main/java/org/apache/syncope/client/http/PreemptiveAuthHttpRequestFactory.java
URL: 
http://svn.apache.org/viewvc/syncope/branches/1_1_X/client/src/main/java/org/apache/syncope/client/http/PreemptiveAuthHttpRequestFactory.java?rev=1577042&r1=1577041&r2=1577042&view=diff
==============================================================================
--- 
syncope/branches/1_1_X/client/src/main/java/org/apache/syncope/client/http/PreemptiveAuthHttpRequestFactory.java
 (original)
+++ 
syncope/branches/1_1_X/client/src/main/java/org/apache/syncope/client/http/PreemptiveAuthHttpRequestFactory.java
 Thu Mar 13 07:11:21 2014
@@ -56,6 +56,11 @@ public class PreemptiveAuthHttpRequestFa
     }
 
     public AuthScope getAuthScope() {
+        return new AuthScope(targetHost.getHostName(), targetHost.getPort(), 
AuthScope.ANY_REALM, targetHost.
+                getSchemeName());
+    }
+
+    public AuthScope getLoginAuthScope() {
         return new AuthScope(targetHost.getHostName(), targetHost.getPort());
     }
 

Modified: 
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/Login.java
URL: 
http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/Login.java?rev=1577042&r1=1577041&r2=1577042&view=diff
==============================================================================
--- 
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/Login.java
 (original)
+++ 
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/Login.java
 Thu Mar 13 07:11:21 2014
@@ -188,7 +188,7 @@ public class Login extends WebPage {
                 ((PreemptiveAuthHttpRequestFactory) 
restTemplate.getRequestFactory());
 
         ((DefaultHttpClient) 
requestFactory.getHttpClient()).getCredentialsProvider().setCredentials(
-                requestFactory.getAuthScope(), new 
UsernamePasswordCredentials(userId, password));
+                requestFactory.getLoginAuthScope(), new 
UsernamePasswordCredentials(userId, password));
 
         // 2. Search authorizations for user specified by credentials
         Set<EntitlementTO> entitlements = 
SyncopeSession.get().getService(EntitlementService.class).getMyEntitlements();

Modified: 
syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
URL: 
http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java?rev=1577042&r1=1577041&r2=1577042&view=diff
==============================================================================
--- 
syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
 (original)
+++ 
syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
 Thu Mar 13 07:11:21 2014
@@ -228,7 +228,7 @@ public abstract class AbstractTest {
                 .getRequestFactory());
 
         ((DefaultHttpClient) 
requestFactory.getHttpClient()).getCredentialsProvider().setCredentials(
-                requestFactory.getAuthScope(), new 
UsernamePasswordCredentials(uid, pwd));
+                requestFactory.getLoginAuthScope(), new 
UsernamePasswordCredentials(uid, pwd));
     }
 
     private RestTemplate getAnonymousRestTemplate() {