You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/08/20 16:03:31 UTC
svn commit: r432969 [2/2] - in /cocoon/trunk/blocks/cocoon-portal:
cocoon-portal-auth-impl/src/main/java/org/apache/cocoon/auth/portal/
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal...
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java?rev=432969&r1=432968&r2=432969&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java Sun Aug 20 07:03:27 2006
@@ -315,9 +315,9 @@
final Map objectModel = ContextHelper.getObjectModel(this.context);
final ServletRequestImpl req = new ServletRequestImpl((HttpServletRequest) objectModel.get(HttpEnvironment.HTTP_REQUEST_OBJECT), event);
final HttpServletResponse res = new ServletResponseImpl((HttpServletResponse) objectModel.get(HttpEnvironment.HTTP_RESPONSE_OBJECT));
- if ( !service.getProfileManager().getUser().isAnonymous() ) {
+ if ( !service.getUserService().getUser().isAnonymous() ) {
req.setAttribute(PortletRequest.USER_INFO,
- service.getProfileManager().getUser().getUserInfos());
+ service.getUserService().getUser().getUserInfos());
}
objectModel.put("portlet-response", res);
objectModel.put("portlet-request", req);
@@ -391,9 +391,9 @@
objectModel.put("portlet-response", new ServletResponseImpl(res));
final ServletRequestImpl req = new ServletRequestImpl((HttpServletRequest) objectModel.get(HttpEnvironment.HTTP_REQUEST_OBJECT), null);
objectModel.put("portlet-request", req);
- if ( !service.getProfileManager().getUser().isAnonymous() ) {
+ if ( !service.getUserService().getUser().isAnonymous() ) {
req.setAttribute(PortletRequest.USER_INFO,
- service.getProfileManager().getUser().getUserInfos());
+ service.getUserService().getUser().getUserInfos());
}
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/ActionRequestFactoryImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/ActionRequestFactoryImpl.java?rev=432969&r1=432968&r2=432969&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/ActionRequestFactoryImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/ActionRequestFactoryImpl.java Sun Aug 20 07:03:27 2006
@@ -67,7 +67,7 @@
public ActionRequest getActionRequest(PortletWindow portletWindow,
HttpServletRequest servletRequest,
HttpServletResponse servletResponse) {
- ActionRequest actionRequest = new ActionRequestImpl(portletWindow, servletRequest, this.portalService.getProfileManager().getUser());
+ ActionRequest actionRequest = new ActionRequestImpl(portletWindow, servletRequest, this.portalService.getUserService().getUser());
return actionRequest;
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/ActionRequestImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/ActionRequestImpl.java?rev=432969&r1=432968&r2=432969&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/ActionRequestImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/ActionRequestImpl.java Sun Aug 20 07:03:27 2006
@@ -19,7 +19,7 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.cocoon.portal.profile.PortalUser;
+import org.apache.cocoon.portal.om.PortalUser;
import org.apache.pluto.om.window.PortletWindow;
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/RenderRequestFactoryImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/RenderRequestFactoryImpl.java?rev=432969&r1=432968&r2=432969&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/RenderRequestFactoryImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/RenderRequestFactoryImpl.java Sun Aug 20 07:03:27 2006
@@ -69,7 +69,7 @@
HttpServletResponse servletResponse) {
RenderRequest renderRequest = new RenderRequestImpl( portletWindow,
servletRequest,
- this.portalService.getProfileManager().getUser());
+ this.portalService.getUserService().getUser());
return renderRequest;
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/RenderRequestImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/RenderRequestImpl.java?rev=432969&r1=432968&r2=432969&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/RenderRequestImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/RenderRequestImpl.java Sun Aug 20 07:03:27 2006
@@ -19,7 +19,7 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.cocoon.portal.profile.PortalUser;
+import org.apache.cocoon.portal.om.PortalUser;
import org.apache.pluto.om.window.PortletWindow;
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java?rev=432969&r1=432968&r2=432969&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java Sun Aug 20 07:03:27 2006
@@ -39,7 +39,6 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.components.thread.RunnableManager;
-import org.apache.cocoon.portal.PortalComponentManager;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.deployment.DeploymentEvent;
import org.apache.cocoon.portal.deployment.DeploymentException;
@@ -492,7 +491,6 @@
// fill portletsKeyObjectId and
// register new coplet data for each portlet
- final PortalComponentManager pcm = this.portalService;
final Iterator portlets = portletApp.getPortletDefinitionList().iterator();
while (portlets.hasNext()) {
final PortletDefinition portlet = (PortletDefinition) portlets.next();
@@ -510,10 +508,10 @@
}
if ( this.createCoplets ) {
// TODO - parse coplet.xml if available
- final CopletType cbd = pcm.getProfileManager().getCopletType(this.copletBaseDataName);
+ final CopletType cbd = this.portalService.getProfileManager().getCopletType(this.copletBaseDataName);
// TODO - check portletId for invalid characters!
final String defId = StringUtils.replaceChars(portlet.getId().toString(), '.', '_');
- final CopletDefinition cd = pcm.getCopletFactory().newInstance(cbd, defId);
+ final CopletDefinition cd = this.portalService.getCopletFactory().newInstance(cbd, defId);
cd.setAttribute("portlet", portlet.getId().toString());
cd.setAttribute("buffer", Boolean.TRUE);
if ( this.getLogger().isInfoEnabled() ) {
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java?rev=432969&r1=432968&r2=432969&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java Sun Aug 20 07:03:27 2006
@@ -621,7 +621,7 @@
* Get the current user
*/
protected String getUser() {
- return this.portalService.getProfileManager().getUser().getUserName();
+ return this.portalService.getUserService().getUser().getUserName();
}
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/PortalToolManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/PortalToolManager.java?rev=432969&r1=432968&r2=432969&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/PortalToolManager.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/PortalToolManager.java Sun Aug 20 07:03:27 2006
@@ -182,8 +182,8 @@
/**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void service(ServiceManager manager) throws ServiceException {
- super.service(manager);
+ public void service(ServiceManager avalonManager) throws ServiceException {
+ super.service(avalonManager);
this.resolver = (SourceResolver)this.manager.lookup(SourceResolver.ROLE);
}
@@ -233,7 +233,7 @@
key = "/" + key;
}
key = this.getClass().getName() + key;
- return (String)this.portalService.getAttribute(key);
+ return (String)this.portalService.getUserService().getAttribute(key);
}
/**
@@ -245,7 +245,7 @@
if (!key.startsWith("/")) {
key = "/" + key;
}
- this.portalService.setAttribute(key, value);
+ this.portalService.getUserService().setAttribute(key, value);
}
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/acting/CheckAccessAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/acting/CheckAccessAction.java?rev=432969&r1=432968&r2=432969&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/acting/CheckAccessAction.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/acting/CheckAccessAction.java Sun Aug 20 07:03:27 2006
@@ -49,7 +49,7 @@
try {
UserRightsService userRightsService = ptm.getUserRightsService();
// FIXME: replace the throw with something else
- if (!userRightsService.userIsAllowed(url, ptm.getPortalObjects().getPortalService().getProfileManager().getUser())) {
+ if (!userRightsService.userIsAllowed(url, ptm.getPortalObjects().getPortalService().getUserService().getUser())) {
throw new ProcessingException(
"You are not allowed to request this page.");
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/helper/MultipleRoleMatcher.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/helper/MultipleRoleMatcher.java?rev=432969&r1=432968&r2=432969&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/helper/MultipleRoleMatcher.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/helper/MultipleRoleMatcher.java Sun Aug 20 07:03:27 2006
@@ -17,7 +17,7 @@
import java.util.StringTokenizer;
-import org.apache.cocoon.portal.profile.PortalUser;
+import org.apache.cocoon.portal.om.PortalUser;
/**
* A role matcher matching against several role.
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/helper/PortalObjects.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/helper/PortalObjects.java?rev=432969&r1=432968&r2=432969&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/helper/PortalObjects.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/helper/PortalObjects.java Sun Aug 20 07:03:27 2006
@@ -15,7 +15,6 @@
*/
package org.apache.cocoon.portal.tools.helper;
-import org.apache.cocoon.portal.PortalComponentManager;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.om.Layout;
import org.apache.cocoon.portal.profile.ProfileManager;
@@ -27,19 +26,13 @@
public class PortalObjects {
private PortalService portalService;
- private PortalComponentManager componentManager;
private ProfileManager profileManager;
private Layout portalLayout;
public PortalObjects(PortalService portalService) {
this.portalService = portalService;
- this.componentManager = portalService;
- this.profileManager = componentManager.getProfileManager();
+ this.profileManager = this.portalService.getProfileManager();
this.portalLayout = profileManager.getLayout(null);
- }
-
- public PortalComponentManager getComponentManager() {
- return componentManager;
}
public Layout getPortalLayout() {
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/helper/RoleMatcher.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/helper/RoleMatcher.java?rev=432969&r1=432968&r2=432969&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/helper/RoleMatcher.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/helper/RoleMatcher.java Sun Aug 20 07:03:27 2006
@@ -15,7 +15,7 @@
*/
package org.apache.cocoon.portal.tools.helper;
-import org.apache.cocoon.portal.profile.PortalUser;
+import org.apache.cocoon.portal.om.PortalUser;
/**
* Defines the interface for role matchers.
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/helper/SingleRoleMatcher.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/helper/SingleRoleMatcher.java?rev=432969&r1=432968&r2=432969&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/helper/SingleRoleMatcher.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/helper/SingleRoleMatcher.java Sun Aug 20 07:03:27 2006
@@ -15,7 +15,7 @@
*/
package org.apache.cocoon.portal.tools.helper;
-import org.apache.cocoon.portal.profile.PortalUser;
+import org.apache.cocoon.portal.om.PortalUser;
/**
* A role matcher matching against a single role.
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/service/UserRightsService.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/service/UserRightsService.java?rev=432969&r1=432968&r2=432969&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/service/UserRightsService.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/service/UserRightsService.java Sun Aug 20 07:03:27 2006
@@ -22,7 +22,7 @@
import java.util.Properties;
import java.util.StringTokenizer;
-import org.apache.cocoon.portal.profile.PortalUser;
+import org.apache.cocoon.portal.om.PortalUser;
import org.apache.cocoon.portal.tools.helper.MultipleRoleMatcher;
import org.apache.cocoon.portal.tools.helper.RoleMatcher;
import org.apache.cocoon.portal.tools.helper.SingleRoleMatcher;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/transformation/CheckAccessTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/transformation/CheckAccessTransformer.java?rev=432969&r1=432968&r2=432969&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/transformation/CheckAccessTransformer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/transformation/CheckAccessTransformer.java Sun Aug 20 07:03:27 2006
@@ -43,8 +43,8 @@
/**
* @see org.apache.cocoon.transformation.AbstractSAXTransformer#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void service(ServiceManager manager) throws ServiceException {
- super.service(manager);
+ public void service(ServiceManager avaloManager) throws ServiceException {
+ super.service(avaloManager);
this.ptm = (PortalToolManager) this.manager.lookup(PortalToolManager.ROLE);
this.urs = ptm.getUserRightsService();
}
@@ -56,7 +56,7 @@
throws SAXException {
if (RIGHTS_NAMESPACE_URI.equals(uri) && ACCESS_TAG.equals(name)) {
String id = attr.getValue(RIGHT_ID);
- if(!urs.userIsAllowed(id, this.ptm.getPortalObjects().getProfileManager().getUser())) {
+ if(!urs.userIsAllowed(id, this.ptm.getPortalObjects().getPortalService().getUserService().getUser())) {
this.stack.push(Boolean.FALSE);
}
this.startRecording();
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/userManagement/ContextGrabber.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/userManagement/ContextGrabber.java?rev=432969&r1=432968&r2=432969&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/userManagement/ContextGrabber.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/userManagement/ContextGrabber.java Sun Aug 20 07:03:27 2006
@@ -35,7 +35,7 @@
*/
public UserBean grab(PortalService service) {
UserBean ub = new UserBean ();
- final Map infos = service.getProfileManager().getUser().getUserInfos();
+ final Map infos = service.getUserService().getUser().getUserInfos();
final Iterator i = infos.entrySet().iterator();
while ( i.hasNext() ) {
final Map.Entry current = (Map.Entry)i.next();
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java?rev=432969&r1=432968&r2=432969&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java Sun Aug 20 07:03:27 2006
@@ -246,7 +246,7 @@
}
// get the wsrp user and store it as an attribute on the instance
- final String currentUserID = this.portalService.getProfileManager().getUser().getUserName();
+ final String currentUserID = this.portalService.getUserService().getUser().getUserName();
User user = this.consumerEnvironment.getUserRegistry().getUser(currentUserID);
if ( user == null ) {
// create a new user