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 2007/02/20 12:32:53 UTC
svn commit: r509515 - in /cocoon/trunk/blocks/cocoon-portal:
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/components/modules/input/
cocoon-portal-impl/src/main/java/org/apache/coco...
Author: cziegeler
Date: Tue Feb 20 03:32:51 2007
New Revision: 509515
URL: http://svn.apache.org/viewvc?view=rev&rev=509515
Log:
Delete role from portal service
Removed:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/model/
Modified:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalService.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/components/modules/input/AbstractModule.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PageLabelManager.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/AspectsBeanDefinitionParser.java (contents, props changed)
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/PortalNamespaceHandler.java (contents, props changed)
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/RegistrationBeanPostProcessor.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/util/AbstractBean.java (contents, props changed)
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/util/AbstractComponent.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/test/java/org/apache/cocoon/portal/AbstractPortalTestCase.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/ActionRequestFactoryImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/RenderRequestFactoryImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/cocoon-portal-sample-components.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/acting/AbstractPortalAction.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/generation/AbstractCopletGenerator.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/generation/PortalGenerator.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/reading/ProxyReader.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/transformation/AbstractCopletTransformer.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/PortalToolManager.java
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalService.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalService.java?view=diff&rev=509515&r1=509514&r2=509515
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalService.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalService.java Tue Feb 20 03:32:51 2007
@@ -44,9 +44,6 @@
*/
public interface PortalService {
- /** The role to lookup this component. */
- String ROLE = PortalService.class.getName();
-
/**
* The name of the portal - as defined in the portal configuration.
*/
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/components/modules/input/AbstractModule.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/components/modules/input/AbstractModule.java?view=diff&rev=509515&r1=509514&r2=509515
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/components/modules/input/AbstractModule.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/components/modules/input/AbstractModule.java Tue Feb 20 03:32:51 2007
@@ -49,7 +49,7 @@
*/
public void service(ServiceManager aManager) throws ServiceException {
this.manager = aManager;
- this.portalService = (PortalService)this.manager.lookup(PortalService.ROLE);
+ this.portalService = (PortalService)this.manager.lookup(PortalService.class.getName());
}
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PageLabelManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PageLabelManager.java?view=diff&rev=509515&r1=509514&r2=509515
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PageLabelManager.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PageLabelManager.java Tue Feb 20 03:32:51 2007
@@ -126,7 +126,7 @@
public Map getPageEventMap() {
PortalService service = null;
try {
- service = (PortalService) this.manager.lookup(PortalService.ROLE);
+ service = (PortalService) this.manager.lookup(PortalService.class.getName());
Map map = (Map) service.getUserService().getAttribute(EVENT_MAP);
if (null == map) {
map = new HashMap();
@@ -151,7 +151,7 @@
public List getPageLabelEvents(String pageLabel) {
PortalService service = null;
try {
- service = (PortalService) this.manager.lookup(PortalService.ROLE);
+ service = (PortalService) this.manager.lookup(PortalService.class.getName());
Map map = (Map) service.getUserService().getAttribute(LABEL_MAP);
if (null == map) {
map = initializeLabels(service);
@@ -179,7 +179,7 @@
private String[] getLabels() {
PortalService service = null;
try {
- service = (PortalService) this.manager.lookup(PortalService.ROLE);
+ service = (PortalService) this.manager.lookup(PortalService.class.getName());
String[] labels = (String[]) service.getUserService().getAttribute(LABEL_ARRAY);
if (null == labels) {
labels = new String[2];
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java?view=diff&rev=509515&r1=509514&r2=509515
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java Tue Feb 20 03:32:51 2007
@@ -138,7 +138,7 @@
public void setServletContext(ServletContext context) {
this.servletContext = context;
// add the portal service to the servlet context
- this.servletContext.setAttribute(PortalService.ROLE, this);
+ this.servletContext.setAttribute(PortalService.class.getName(), this);
}
/**
@@ -147,7 +147,7 @@
public void dispose() {
// remove the portal service from the servlet context - if available
if ( this.servletContext != null ) {
- this.servletContext.removeAttribute(PortalService.ROLE);
+ this.servletContext.removeAttribute(PortalService.class.getName());
}
if ( this.manager != null ) {
this.renderers.clear();
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/AspectsBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/AspectsBeanDefinitionParser.java?view=diff&rev=509515&r1=509514&r2=509515
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/AspectsBeanDefinitionParser.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/AspectsBeanDefinitionParser.java Tue Feb 20 03:32:51 2007
@@ -1,124 +1,124 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cocoon.portal.spring;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.cocoon.portal.services.aspects.support.AspectChain;
-import org.apache.cocoon.spring.configurator.impl.AbstractElementParser;
-import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.BeanDefinitionHolder;
-import org.springframework.beans.factory.config.RuntimeBeanReference;
-import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
-import org.springframework.beans.factory.support.ManagedList;
-import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.StringUtils;
-import org.w3c.dom.Element;
-
-/**
- *
- * @version $Id$
- */
-public class AspectsBeanDefinitionParser extends AbstractElementParser {
-
- protected final String baseClass;
-
- protected final Class aspectChainClass;
-
- public AspectsBeanDefinitionParser(final String className) {
- this.baseClass = className;
- this.aspectChainClass = AspectChain.class;
- }
-
- public AspectsBeanDefinitionParser(final String className, Class aspectChainClass) {
- this.baseClass = className;
- this.aspectChainClass = aspectChainClass;
- }
-
- /**
- * @see org.springframework.beans.factory.xml.BeanDefinitionParser#parse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
- */
- public BeanDefinition parse(Element element, ParserContext parserContext) {
- // create a new bean definition for the aspect chain
- RootBeanDefinition beanDef = this.createBeanDefinition(this.aspectChainClass, null, false);
- final ManagedList aspectBeans = new ManagedList();
- aspectBeans.setSource(parserContext.getReaderContext().extractSource(element));
- final List aspectProperties = new ArrayList();
- final Element[] aspects = this.getChildElements(element, "aspect");
- for(int i=0; i<aspects.length; i++) {
- final String ref = this.getAttributeValue(aspects[i], "ref", null);
- final String type= this.getAttributeValue(aspects[i], "type", null);
- if ( ref == null && type == null ) {
- throw new BeanDefinitionStoreException("Element 'aspect' must have either a 'ref' or a 'type' attribute.");
- }
- if ( ref != null && type != null ) {
- throw new BeanDefinitionStoreException("Element 'aspect' must have either a 'ref' or a 'type' attribute, but not both.");
- }
- final String beanName = (ref != null ? ref : this.baseClass + '.' + type);
- aspectBeans.add(new RuntimeBeanReference(beanName));
- // properties
- final Properties props = new Properties();
- final Element[] properties = this.getChildElements(aspects[i], "property");
- for(int m=0; m<properties.length;m++) {
- props.setProperty(this.getAttributeValue(properties[m], "name", null),
- this.getAttributeValue(properties[m], "value", null));
- }
- if ( props.size() == 0 ) {
- aspectProperties.add(AspectChain.EMPTY_PROPERTIES);
- } else {
- aspectProperties.add(props);
- }
- }
- try {
- beanDef.getConstructorArgumentValues().addIndexedArgumentValue(0, ClassUtils.forName(this.baseClass));
- } catch (ClassNotFoundException e) {
- throw new BeanDefinitionStoreException("Unable to load aspect class: " + this.baseClass, e);
- }
- beanDef.getConstructorArgumentValues().addIndexedArgumentValue(1, aspectBeans);
- beanDef.getConstructorArgumentValues().addIndexedArgumentValue(2, aspectProperties);
-
- if ( !parserContext.isNested() ) {
- String id = element.getAttribute(BeanDefinitionParserDelegate.ID_ATTRIBUTE);
- String nameAttr = element.getAttribute(BeanDefinitionParserDelegate.NAME_ATTRIBUTE);
-
- List aliases = new ArrayList();
- if (StringUtils.hasLength(nameAttr)) {
- String[] nameArr = StringUtils.tokenizeToStringArray(nameAttr, BeanDefinitionParserDelegate.BEAN_NAME_DELIMITERS);
- aliases.addAll(Arrays.asList(nameArr));
- }
-
- String beanName = id;
- if (!StringUtils.hasText(beanName) && !aliases.isEmpty()) {
- beanName = (String) aliases.remove(0);
- if (logger.isDebugEnabled()) {
- logger.debug("No XML 'id' specified - using '" + beanName +
- "' as bean name and " + aliases + " as aliases");
- }
- }
- final BeanDefinitionHolder holder = new BeanDefinitionHolder(beanDef, beanName, StringUtils.toStringArray(aliases));
- BeanDefinitionReaderUtils.registerBeanDefinition(holder, parserContext.getRegistry());
- }
- return beanDef;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.portal.spring;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
+
+import org.apache.cocoon.portal.services.aspects.support.AspectChain;
+import org.apache.cocoon.spring.configurator.impl.AbstractElementParser;
+import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.BeanDefinitionHolder;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
+import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
+import org.springframework.beans.factory.support.ManagedList;
+import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.StringUtils;
+import org.w3c.dom.Element;
+
+/**
+ *
+ * @version $Id$
+ */
+public class AspectsBeanDefinitionParser extends AbstractElementParser {
+
+ protected final String baseClass;
+
+ protected final Class aspectChainClass;
+
+ public AspectsBeanDefinitionParser(final String className) {
+ this.baseClass = className;
+ this.aspectChainClass = AspectChain.class;
+ }
+
+ public AspectsBeanDefinitionParser(final String className, Class aspectChainClass) {
+ this.baseClass = className;
+ this.aspectChainClass = aspectChainClass;
+ }
+
+ /**
+ * @see org.springframework.beans.factory.xml.BeanDefinitionParser#parse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
+ */
+ public BeanDefinition parse(Element element, ParserContext parserContext) {
+ // create a new bean definition for the aspect chain
+ RootBeanDefinition beanDef = this.createBeanDefinition(this.aspectChainClass, null, false);
+ final ManagedList aspectBeans = new ManagedList();
+ aspectBeans.setSource(parserContext.getReaderContext().extractSource(element));
+ final List aspectProperties = new ArrayList();
+ final Element[] aspects = this.getChildElements(element, "aspect");
+ for(int i=0; i<aspects.length; i++) {
+ final String ref = this.getAttributeValue(aspects[i], "ref", null);
+ final String type= this.getAttributeValue(aspects[i], "type", null);
+ if ( ref == null && type == null ) {
+ throw new BeanDefinitionStoreException("Element 'aspect' must have either a 'ref' or a 'type' attribute.");
+ }
+ if ( ref != null && type != null ) {
+ throw new BeanDefinitionStoreException("Element 'aspect' must have either a 'ref' or a 'type' attribute, but not both.");
+ }
+ final String beanName = (ref != null ? ref : this.baseClass + '.' + type);
+ aspectBeans.add(new RuntimeBeanReference(beanName));
+ // properties
+ final Properties props = new Properties();
+ final Element[] properties = this.getChildElements(aspects[i], "property");
+ for(int m=0; m<properties.length;m++) {
+ props.setProperty(this.getAttributeValue(properties[m], "name", null),
+ this.getAttributeValue(properties[m], "value", null));
+ }
+ if ( props.size() == 0 ) {
+ aspectProperties.add(AspectChain.EMPTY_PROPERTIES);
+ } else {
+ aspectProperties.add(props);
+ }
+ }
+ try {
+ beanDef.getConstructorArgumentValues().addIndexedArgumentValue(0, ClassUtils.forName(this.baseClass));
+ } catch (ClassNotFoundException e) {
+ throw new BeanDefinitionStoreException("Unable to load aspect class: " + this.baseClass, e);
+ }
+ beanDef.getConstructorArgumentValues().addIndexedArgumentValue(1, aspectBeans);
+ beanDef.getConstructorArgumentValues().addIndexedArgumentValue(2, aspectProperties);
+
+ if ( !parserContext.isNested() ) {
+ String id = element.getAttribute(BeanDefinitionParserDelegate.ID_ATTRIBUTE);
+ String nameAttr = element.getAttribute(BeanDefinitionParserDelegate.NAME_ATTRIBUTE);
+
+ List aliases = new ArrayList();
+ if (StringUtils.hasLength(nameAttr)) {
+ String[] nameArr = StringUtils.tokenizeToStringArray(nameAttr, BeanDefinitionParserDelegate.BEAN_NAME_DELIMITERS);
+ aliases.addAll(Arrays.asList(nameArr));
+ }
+
+ String beanName = id;
+ if (!StringUtils.hasText(beanName) && !aliases.isEmpty()) {
+ beanName = (String) aliases.remove(0);
+ if (logger.isDebugEnabled()) {
+ logger.debug("No XML 'id' specified - using '" + beanName +
+ "' as bean name and " + aliases + " as aliases");
+ }
+ }
+ final BeanDefinitionHolder holder = new BeanDefinitionHolder(beanDef, beanName, StringUtils.toStringArray(aliases));
+ BeanDefinitionReaderUtils.registerBeanDefinition(holder, parserContext.getRegistry());
+ }
+ return beanDef;
+ }
+}
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/AspectsBeanDefinitionParser.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/AspectsBeanDefinitionParser.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/PortalNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/PortalNamespaceHandler.java?view=diff&rev=509515&r1=509514&r2=509515
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/PortalNamespaceHandler.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/PortalNamespaceHandler.java Tue Feb 20 03:32:51 2007
@@ -1,41 +1,41 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cocoon.portal.spring;
-
-import org.apache.cocoon.portal.event.aspect.EventAspect;
-import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect;
-import org.apache.cocoon.portal.layout.renderer.aspect.impl.support.RendererAspectChain;
-import org.apache.cocoon.portal.services.aspects.PortalManagerAspect;
-import org.apache.cocoon.portal.services.aspects.ProfileManagerAspect;
-import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
-
-/**
- *
- * @version $Id$
- */
-public class PortalNamespaceHandler extends NamespaceHandlerSupport {
-
- /**
- * @see org.springframework.beans.factory.xml.NamespaceHandler#init()
- */
- public void init() {
- this.registerBeanDefinitionParser("event-aspects", new AspectsBeanDefinitionParser(EventAspect.class.getName()));
- this.registerBeanDefinitionParser("renderer-aspects", new AspectsBeanDefinitionParser(RendererAspect.class.getName(), RendererAspectChain.class));
- this.registerBeanDefinitionParser("portal-manager-aspects", new AspectsBeanDefinitionParser(PortalManagerAspect.class.getName()));
- this.registerBeanDefinitionParser("profile-manager-aspects", new AspectsBeanDefinitionParser(ProfileManagerAspect.class.getName()));
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.portal.spring;
+
+import org.apache.cocoon.portal.event.aspect.EventAspect;
+import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect;
+import org.apache.cocoon.portal.layout.renderer.aspect.impl.support.RendererAspectChain;
+import org.apache.cocoon.portal.services.aspects.PortalManagerAspect;
+import org.apache.cocoon.portal.services.aspects.ProfileManagerAspect;
+import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+
+/**
+ *
+ * @version $Id$
+ */
+public class PortalNamespaceHandler extends NamespaceHandlerSupport {
+
+ /**
+ * @see org.springframework.beans.factory.xml.NamespaceHandler#init()
+ */
+ public void init() {
+ this.registerBeanDefinitionParser("event-aspects", new AspectsBeanDefinitionParser(EventAspect.class.getName()));
+ this.registerBeanDefinitionParser("renderer-aspects", new AspectsBeanDefinitionParser(RendererAspect.class.getName(), RendererAspectChain.class));
+ this.registerBeanDefinitionParser("portal-manager-aspects", new AspectsBeanDefinitionParser(PortalManagerAspect.class.getName()));
+ this.registerBeanDefinitionParser("profile-manager-aspects", new AspectsBeanDefinitionParser(ProfileManagerAspect.class.getName()));
+ }
+}
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/PortalNamespaceHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/PortalNamespaceHandler.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/RegistrationBeanPostProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/RegistrationBeanPostProcessor.java?view=diff&rev=509515&r1=509514&r2=509515
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/RegistrationBeanPostProcessor.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/RegistrationBeanPostProcessor.java Tue Feb 20 03:32:51 2007
@@ -54,10 +54,10 @@
if ( name.startsWith(RENDERER_ROLE_PREFIX) ) {
name = name.substring(RENDERER_ROLE_PREFIX.length());
}
- ((PortalService)this.beanFactory.getBean(PortalService.ROLE)).register(name, (Renderer)bean);
+ ((PortalService)this.beanFactory.getBean(PortalService.class.getName())).register(name, (Renderer)bean);
}
if ( bean instanceof CopletAdapter && bean instanceof PortalManagerAspect ) {
- ((PortalService)this.beanFactory.getBean(PortalService.ROLE)).getPortalManager().register((PortalManagerAspect)bean);
+ ((PortalService)this.beanFactory.getBean(PortalService.class.getName())).getPortalManager().register((PortalManagerAspect)bean);
}
return bean;
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/util/AbstractBean.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/util/AbstractBean.java?view=diff&rev=509515&r1=509514&r2=509515
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/util/AbstractBean.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/util/AbstractBean.java Tue Feb 20 03:32:51 2007
@@ -1,51 +1,51 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cocoon.portal.util;
-
-import org.apache.cocoon.portal.PortalService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * This class can be used as a base class for all portal related components
- * that do not use Avalon anymore.
- *
- * @version $Id: AbstractComponent.java 449173 2006-09-23 05:52:37Z crossley $
- */
-public class AbstractBean {
-
- /** The portal service. */
- protected PortalService portalService;
-
- /** By default we use the logger for this class. */
- private Log logger = LogFactory.getLog(getClass());
-
- public Log getLogger() {
- return this.logger;
- }
-
- public void setLogger(Log l) {
- this.logger = l;
- }
-
- /**
- * Set the portal service.
- */
- public void setPortalService(PortalService service) {
- this.portalService = service;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.portal.util;
+
+import org.apache.cocoon.portal.PortalService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * This class can be used as a base class for all portal related components
+ * that do not use Avalon anymore.
+ *
+ * @version $Id$
+ */
+public class AbstractBean {
+
+ /** The portal service. */
+ protected PortalService portalService;
+
+ /** By default we use the logger for this class. */
+ private Log logger = LogFactory.getLog(getClass());
+
+ public Log getLogger() {
+ return this.logger;
+ }
+
+ public void setLogger(Log l) {
+ this.logger = l;
+ }
+
+ /**
+ * Set the portal service.
+ */
+ public void setPortalService(PortalService service) {
+ this.portalService = service;
+ }
+}
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/util/AbstractBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/util/AbstractBean.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/util/AbstractComponent.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/util/AbstractComponent.java?view=diff&rev=509515&r1=509514&r2=509515
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/util/AbstractComponent.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/util/AbstractComponent.java Tue Feb 20 03:32:51 2007
@@ -59,7 +59,7 @@
*/
public void service(ServiceManager aManager) throws ServiceException {
this.manager = aManager;
- this.portalService = (PortalService) this.manager.lookup(PortalService.ROLE);
+ this.portalService = (PortalService) this.manager.lookup(PortalService.class.getName());
}
/**
* @see org.apache.avalon.framework.activity.Disposable#dispose()
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/test/java/org/apache/cocoon/portal/AbstractPortalTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/test/java/org/apache/cocoon/portal/AbstractPortalTestCase.java?view=diff&rev=509515&r1=509514&r2=509515
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/test/java/org/apache/cocoon/portal/AbstractPortalTestCase.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/test/java/org/apache/cocoon/portal/AbstractPortalTestCase.java Tue Feb 20 03:32:51 2007
@@ -84,7 +84,7 @@
// Add portal service
final ComponentInfo portalServiceInfo = new ComponentInfo();
portalServiceInfo.setComponentClassName(PortalServiceImpl.class.getName());
- portalServiceInfo.setRole(PortalService.ROLE);
+ portalServiceInfo.setRole(PortalService.class.getName());
portalServiceInfo.setConfiguration(this.getPortalServiceConfig());
info.addComponent(portalServiceInfo);
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java?view=diff&rev=509515&r1=509514&r2=509515
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java Tue Feb 20 03:32:51 2007
@@ -79,7 +79,7 @@
this.portletWindow = portletWindow;
PortalService service = null;
try {
- service = (PortalService) manager.lookup(PortalService.ROLE);
+ service = (PortalService) manager.lookup(PortalService.class.getName());
this.linkService = service.getLinkService();
} catch (ServiceException se) {
throw new PortalRuntimeException("Unable to lookup portal service.", se);
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?view=diff&rev=509515&r1=509514&r2=509515
==============================================================================
--- 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 Tue Feb 20 03:32:51 2007
@@ -59,7 +59,7 @@
*/
public void service(ServiceManager serviceManager) throws ServiceException {
this.manager = serviceManager;
- this.portalService = (PortalService)this.manager.lookup(PortalService.ROLE);
+ this.portalService = (PortalService)this.manager.lookup(PortalService.class.getName());
}
/**
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?view=diff&rev=509515&r1=509514&r2=509515
==============================================================================
--- 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 Tue Feb 20 03:32:51 2007
@@ -59,7 +59,7 @@
*/
public void service(ServiceManager serviceManager) throws ServiceException {
this.manager = serviceManager;
- this.portalService = (PortalService)this.manager.lookup(PortalService.ROLE);
+ this.portalService = (PortalService)this.manager.lookup(PortalService.class.getName());
}
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/cocoon-portal-sample-components.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/cocoon-portal-sample-components.xml?view=diff&rev=509515&r1=509514&r2=509515
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/cocoon-portal-sample-components.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/cocoon-portal-sample-components.xml Tue Feb 20 03:32:51 2007
@@ -72,4 +72,5 @@
<portal:portal-manager-aspects id="org.apache.cocoon.portal.services.PortalManager.aspects">
<!-- Add your aspects here -->
</portal:portal-manager-aspects>
+
</beans>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/acting/AbstractPortalAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/acting/AbstractPortalAction.java?view=diff&rev=509515&r1=509514&r2=509515
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/acting/AbstractPortalAction.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/acting/AbstractPortalAction.java Tue Feb 20 03:32:51 2007
@@ -50,6 +50,6 @@
*/
public void service(ServiceManager aManager) throws ServiceException {
super.service(aManager);
- this.portalService = (PortalService) this.manager.lookup(PortalService.ROLE);
+ this.portalService = (PortalService) this.manager.lookup(PortalService.class.getName());
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/generation/AbstractCopletGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/generation/AbstractCopletGenerator.java?view=diff&rev=509515&r1=509514&r2=509515
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/generation/AbstractCopletGenerator.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/generation/AbstractCopletGenerator.java Tue Feb 20 03:32:51 2007
@@ -132,6 +132,6 @@
*/
public void service(ServiceManager aManager) throws ServiceException {
super.service(aManager);
- this.portalService = (PortalService)this.manager.lookup(PortalService.ROLE);
+ this.portalService = (PortalService)this.manager.lookup(PortalService.class.getName());
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/generation/PortalGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/generation/PortalGenerator.java?view=diff&rev=509515&r1=509514&r2=509515
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/generation/PortalGenerator.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/generation/PortalGenerator.java Tue Feb 20 03:32:51 2007
@@ -62,7 +62,7 @@
*/
public void service(ServiceManager aManager) throws ServiceException {
super.service(aManager);
- this.portalService = (PortalService)this.manager.lookup(PortalService.ROLE);
+ this.portalService = (PortalService)this.manager.lookup(PortalService.class.getName());
}
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/reading/ProxyReader.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/reading/ProxyReader.java?view=diff&rev=509515&r1=509514&r2=509515
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/reading/ProxyReader.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/reading/ProxyReader.java Tue Feb 20 03:32:51 2007
@@ -72,7 +72,7 @@
*/
public void service(ServiceManager aManager) throws ServiceException {
super.service(aManager);
- this.portalService = (PortalService)this.manager.lookup(PortalService.ROLE);
+ this.portalService = (PortalService)this.manager.lookup(PortalService.class.getName());
}
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/transformation/AbstractCopletTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/transformation/AbstractCopletTransformer.java?view=diff&rev=509515&r1=509514&r2=509515
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/transformation/AbstractCopletTransformer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/transformation/AbstractCopletTransformer.java Tue Feb 20 03:32:51 2007
@@ -116,7 +116,7 @@
*/
public void service(ServiceManager aManager) throws ServiceException {
super.service(aManager);
- this.portalService = (PortalService)this.manager.lookup(PortalService.ROLE);
+ this.portalService = (PortalService)this.manager.lookup(PortalService.class.getName());
}
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java?view=diff&rev=509515&r1=509514&r2=509515
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sitemap/src/main/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java Tue Feb 20 03:32:51 2007
@@ -124,7 +124,7 @@
*/
public void service(ServiceManager aManager) throws ServiceException {
this.manager = aManager;
- this.portalService = (PortalService)this.manager.lookup(PortalService.ROLE);
+ this.portalService = (PortalService)this.manager.lookup(PortalService.class.getName());
this.imHelper = new InputModuleHelper(manager);
}
@@ -581,7 +581,7 @@
PortalService portalService = null;
try {
- portalService = (PortalService) manager.lookup(PortalService.ROLE);
+ portalService = (PortalService) manager.lookup(PortalService.class.getName());
// determine coplet id
String copletId = null;
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?view=diff&rev=509515&r1=509514&r2=509515
==============================================================================
--- 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 Tue Feb 20 03:32:51 2007
@@ -262,7 +262,7 @@
public PortalObjects getPortalObjects() {
try {
- return new PortalObjects((PortalService) this.manager.lookup(org.apache.cocoon.portal.PortalService.ROLE));
+ return new PortalObjects((PortalService) this.manager.lookup(org.apache.cocoon.portal.PortalService.class.getName()));
} catch (ServiceException e) {
return null;
}