svn commit: r1433883 - in /syncope/trunk: client/src/main/java/org/apache/syncope/services/UserRequestService.java console/src/main/java/org/apache/syncope/console/pages/Login.java

[jb...@apache.org]

Author: jbernhardt
Date: Wed Jan 16 10:27:28 2013
New Revision: 1433883

URL: http://svn.apache.org/viewvc?rev=1433883&view=rev
Log:
[SYNCOPE-259]
* Updating Login module to use Spring REST Proxies
* Removing obsolete comment

Modified:
    syncope/trunk/client/src/main/java/org/apache/syncope/services/UserRequestService.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java

Modified: syncope/trunk/client/src/main/java/org/apache/syncope/services/UserRequestService.java
URL: http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/services/UserRequestService.java?rev=1433883&r1=1433882&r2=1433883&view=diff
==============================================================================
--- syncope/trunk/client/src/main/java/org/apache/syncope/services/UserRequestService.java (original)
+++ syncope/trunk/client/src/main/java/org/apache/syncope/services/UserRequestService.java Wed Jan 16 10:27:28 2013
@@ -33,7 +33,6 @@ public interface UserRequestService {
 
     @GET
     @Path("create/allowed")
-    //@RequestMapping(method = RequestMethod.GET, value = "/create/allowed")
     boolean isCreateAllowed();
 
     @POST

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java?rev=1433883&r1=1433882&r2=1433883&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java Wed Jan 16 10:27:28 2013
@@ -30,6 +30,8 @@ import org.apache.syncope.client.http.Pr
 import org.apache.syncope.client.to.UserTO;
 import org.apache.syncope.console.SyncopeSession;
 import org.apache.syncope.console.wicket.markup.html.form.LinkPanel;
+import org.apache.syncope.services.EntitlementService;
+import org.apache.syncope.services.UserRequestService;
 import org.apache.wicket.Page;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -185,14 +187,13 @@ public class Login extends WebPage {
                 requestFactory.getAuthScope(), new UsernamePasswordCredentials(userId, password));
 
         // 2. Search authorizations for user specified by credentials
-        return restTemplate.getForObject(baseURL + "auth/entitlements.json", String[].class);
+        return SyncopeSession.get().getService(EntitlementService.class).getMyEntitlements().toArray(new String[0]);
     }
 
     private boolean isSelfRegistrationAllowed() {
         Boolean result = null;
         try {
-            final RestTemplate restTemplate = SyncopeSession.get().getRestTemplate();
-            result = restTemplate.getForObject(baseURL + "user/request/create/allowed", Boolean.class);
+            result = SyncopeSession.get().getService(UserRequestService.class).isCreateAllowed();
         } catch (HttpClientErrorException e) {
             LOG.error("While seeking if self registration is allowed", e);
         }