From: <die...@us...> - 2012-03-15 06:51:53
|
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. |
From: <luc...@us...> - 2013-08-22 11:03:19
|
Revision: 4281 http://openutils.svn.sourceforge.net/openutils/?rev=4281&view=rev Author: lucaboati Date: 2013-08-22 11:03:13 +0000 (Thu, 22 Aug 2013) Log Message: ----------- license format 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/CasClientCallback.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 magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasModuleVersionHandler.java magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/RequestUtils.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 2013-07-24 09:29:54 UTC (rev 4280) +++ magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CASAuthenticationModule.java 2013-08-22 11:03:13 UTC (rev 4281) @@ -1,7 +1,7 @@ /** * * CAS integration module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcas.html) - * Copyright(C) 2007-2012, Openmind S.r.l. http://www.openmindonline.it + * Copyright(C) 2007-2013, Openmind S.r.l. http://www.openmindonline.it * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasClientCallback.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasClientCallback.java 2013-07-24 09:29:54 UTC (rev 4280) +++ magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasClientCallback.java 2013-08-22 11:03:13 UTC (rev 4281) @@ -1,7 +1,7 @@ /** * * CAS integration module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcas.html) - * Copyright(C) 2007-2012, Openmind S.r.l. http://www.openmindonline.it + * Copyright(C) 2007-2013, Openmind S.r.l. http://www.openmindonline.it * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by 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 2013-07-24 09:29:54 UTC (rev 4280) +++ magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasLogin.java 2013-08-22 11:03:13 UTC (rev 4281) @@ -1,7 +1,7 @@ /** * * CAS integration module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcas.html) - * Copyright(C) 2007-2012, Openmind S.r.l. http://www.openmindonline.it + * Copyright(C) 2007-2013, Openmind S.r.l. http://www.openmindonline.it * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by 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 2013-07-24 09:29:54 UTC (rev 4280) +++ magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasMagnoliaUser.java 2013-08-22 11:03:13 UTC (rev 4281) @@ -1,7 +1,7 @@ /** * * CAS integration module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcas.html) - * Copyright(C) 2007-2012, Openmind S.r.l. http://www.openmindonline.it + * Copyright(C) 2007-2013, Openmind S.r.l. http://www.openmindonline.it * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasModuleVersionHandler.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasModuleVersionHandler.java 2013-07-24 09:29:54 UTC (rev 4280) +++ magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CasModuleVersionHandler.java 2013-08-22 11:03:13 UTC (rev 4281) @@ -1,7 +1,7 @@ /** * * CAS integration module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcas.html) - * Copyright(C) 2007-2012, Openmind S.r.l. http://www.openmindonline.it + * Copyright(C) 2007-2013, Openmind S.r.l. http://www.openmindonline.it * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/RequestUtils.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/RequestUtils.java 2013-07-24 09:29:54 UTC (rev 4280) +++ magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/RequestUtils.java 2013-08-22 11:03:13 UTC (rev 4281) @@ -1,7 +1,7 @@ /** * * CAS integration module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcas.html) - * Copyright(C) 2007-2012, Openmind S.r.l. http://www.openmindonline.it + * Copyright(C) 2007-2013, Openmind S.r.l. http://www.openmindonline.it * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |