[Openutils-svn] SF.net SVN: openutils:[3795] magnoliamodules/trunk/openutils-mgnlcas/src/ main/java/net/sourceforge/openutils/mgnlcas

[<die...@us...>]

Revision: 3795
          http://openutils.svn.sourceforge.net/openutils/?rev=3795&view=rev
Author:   diego_schivo
Date:     2012-03-15 06:51:47 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
openutils-mgnlcas: fix compile errors

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CASAuthenticationModule.java
    magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasLogin.java
    magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasMagnoliaUser.java

Modified: magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CASAuthenticationModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CASAuthenticationModule.java	2012-03-15 06:50:32 UTC (rev 3794)
+++ magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CASAuthenticationModule.java	2012-03-15 06:51:47 UTC (rev 3795)
@@ -19,6 +19,7 @@
 
 package net.sourceforge.openutils.mgnlcas;
 
+import info.magnolia.cms.security.Realm;
 import info.magnolia.cms.security.User;
 import info.magnolia.cms.security.auth.Entity;
 import info.magnolia.cms.security.auth.GroupList;
@@ -226,7 +227,8 @@
         // this.pswd = ((PasswordCallback) callbacks[1]).getPassword();
         if (this.useRealmCallback)
         {
-            this.realm = StringUtils.defaultIfEmpty(realmCallback.getRealm(), this.realm);
+            this.realm = StringUtils.isBlank(realmCallback.getRealm()) ? this.realm : Realm.Factory
+                .newRealm(realmCallback.getRealm());
         }
 
         String ticket = ticketCallback.getText();

Modified: magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasLogin.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasLogin.java	2012-03-15 06:50:32 UTC (rev 3794)
+++ magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasLogin.java	2012-03-15 06:51:47 UTC (rev 3795)
@@ -165,7 +165,6 @@
 
             if (user != null)
             {
-                user.setSubject(subject);
             }
             else
             {
@@ -173,7 +172,7 @@
                     .error("Unable to obtain a user from userManager, maybe the external user manager is not configured for the cas realm?");
             }
 
-            return new LoginResult(LoginResult.STATUS_SUCCEEDED, user);
+            return new LoginResult(LoginResult.STATUS_SUCCEEDED, subject);
         }
         catch (LoginException e)
         {

Modified: magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasMagnoliaUser.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasMagnoliaUser.java	2012-03-15 06:50:32 UTC (rev 3794)
+++ magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasMagnoliaUser.java	2012-03-15 06:51:47 UTC (rev 3795)
@@ -55,7 +55,6 @@
         final Set<Entity> principalDetails = subject.getPrincipals(Entity.class);
         final Iterator<Entity> entityIterator = principalDetails.iterator();
         this.userDetails = entityIterator.next();
-        setSubject(subject);
     }
 
     /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.