Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 48903 invoked from network); 14 Feb 2005 15:11:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 14 Feb 2005 15:11:22 -0000 Received: (qmail 50557 invoked by uid 500); 14 Feb 2005 15:11:18 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 50464 invoked by uid 500); 14 Feb 2005 15:11:18 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 50389 invoked by uid 99); 14 Feb 2005 15:11:18 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 14 Feb 2005 07:11:17 -0800 Received: (qmail 48747 invoked by uid 65534); 14 Feb 2005 15:11:16 -0000 Message-ID: <20050214151116.48745.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Mon, 14 Feb 2005 15:11:15 -0000 Subject: svn commit: r153796 - in cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal: coplets/basket/BasketManagerImpl.java profile/impl/GroupBasedProfileManager.java To: cvs@cocoon.apache.org From: cziegeler@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: cziegeler Date: Mon Feb 14 07:11:14 2005 New Revision: 153796 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D153796 Log: Fix bug in GroupBasedProfileManager; make basket independent from used auth= entication method Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplets/ba= sket/BasketManagerImpl.java cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/profile/im= pl/GroupBasedProfileManager.java Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/copl= ets/basket/BasketManagerImpl.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/java/org/= apache/cocoon/portal/coplets/basket/BasketManagerImpl.java?view=3Ddiff&r1= =3D153795&r2=3D153796 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplets/ba= sket/BasketManagerImpl.java (original) +++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplets/ba= sket/BasketManagerImpl.java Mon Feb 14 07:11:14 2005 @@ -71,8 +71,6 @@ import org.apache.cocoon.servlet.multipart.Part; import org.apache.cocoon.servlet.multipart.PartOnDisk; import org.apache.cocoon.util.ClassUtils; -import org.apache.cocoon.webapps.authentication.AuthenticationManager; -import org.apache.cocoon.webapps.authentication.user.RequestState; import org.apache.excalibur.source.Source; import org.apache.excalibur.source.SourceResolver; =20 @@ -485,7 +483,7 @@ this.saveContentStore(BRIEFCASE_KEY, store); } else if ( store instanceof Folder ) { this.saveContentStore(FOLDER_KEY, store); - } + } } =20 /**=20 @@ -544,9 +542,9 @@ store =3D new Briefcase(user); } else { store =3D new Folder(user); + } } } - } return store; } =20 @@ -689,19 +687,18 @@ * Get the current user */ protected String getUser() { - AuthenticationManager authManager =3D null; - try { - authManager =3D (AuthenticationManager)this.manager.lookup= (AuthenticationManager.ROLE); - RequestState rs =3D authManager.getState(); - return rs.getHandler().getUserId(); - } catch (ServiceException ignore) { - // ignore this + PortalService service =3D null; + try { + service =3D (PortalService)this.manager.lookup(PortalService.R= OLE); + return service.getComponentManager().getProfileManager().getUs= er().getUserName(); + } catch (ServiceException ignore) { + // ignore this } finally { - this.manager.release(authManager); - } + this.manager.release(service); + } return null; =20 - } + } =20 /* (non-Javadoc) * @see org.apache.cocoon.portal.coplets.basket.BasketManager#getBaske= tActions() Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/prof= ile/impl/GroupBasedProfileManager.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/java/org/= apache/cocoon/portal/profile/impl/GroupBasedProfileManager.java?view=3Ddiff= &r1=3D153795&r2=3D153796 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/profile/im= pl/GroupBasedProfileManager.java (original) +++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/profile/im= pl/GroupBasedProfileManager.java Mon Feb 14 07:11:14 2005 @@ -403,7 +403,7 @@ =20 // first "load" the global data profile.setCopletBaseDatas( this.getGlobalBaseDatas(loader, in= fo, service) ); - profile.setCopletDatas( this.getGlobalDatas(loader, info, serv= ice) ); + profile.setCopletDatas( this.getGlobalDatas(loader, info, serv= ice, profile) ); =20 // now load the user/group specific data if ( !this.getCopletInstanceDatas(loader, profile, info, servi= ce, CATEGORY_USER) ) { @@ -464,7 +464,8 @@ =20 protected Map getGlobalDatas(final ProfileLS loader, final UserInfo info, - final PortalService service)=20 + final PortalService service, + final UserProfile profile)=20 throws Exception { synchronized ( this ) { final Map key =3D this.buildKey(CATEGORY_GLOBAL,=20 @@ -474,6 +475,8 @@ final Map parameters =3D new HashMap(); parameters.put(ProfileLS.PARAMETER_PROFILETYPE,=20 ProfileLS.PROFILETYPE_COPLETDATA); + parameters.put(ProfileLS.PARAMETER_OBJECTMAP, + profile.getCopletBaseDatas()); =20 if ( this.copletDatas.validity !=3D null && this.copletDatas.validity.isValid() =3D=3D SourceValid= ity.VALID) { @@ -515,7 +518,7 @@ Map parameters =3D new HashMap(); parameters.put(ProfileLS.PARAMETER_PROFILETYPE,=20 ProfileLS.PROFILETYPE_COPLETINSTANCEDATA); =20 - parameters.put(ProfileLS.PARAMETER_OBJECTMAP,=20 + parameters.put(ProfileLS.PARAMETER_OBJECTMAP, profile.getCopletDatas()); =20 try {