Author: cziegeler Date: Wed Dec 15 06:58:52 2004 New Revision: 111972 URL: http://svn.apache.org/viewcvs?view=rev&rev=111972 Log: Removing extra configuration for application coplet Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java?view=diff&rev=111972&p1=cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java&r1=111971&p2=cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java&r2=111972 ============================================================================== --- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java (original) +++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java Wed Dec 15 06:58:52 2004 @@ -17,7 +17,6 @@ import org.apache.avalon.framework.service.ServiceException; import org.apache.cocoon.ProcessingException; -import org.apache.cocoon.portal.application.PortalApplicationConfigFactory; import org.apache.cocoon.portal.coplet.CopletData; import org.apache.cocoon.portal.coplet.CopletFactory; import org.apache.cocoon.portal.coplet.CopletInstanceData; @@ -40,7 +39,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Gerald Kahrer</a> * - * @version CVS $Id: ApplicationCopletAdapter.java,v 1.5 2004/04/25 20:09:34 haul Exp $ + * @version CVS $Id$ */ public class ApplicationCopletAdapter extends CachingURICopletAdapter { @@ -153,45 +152,7 @@ if (selectedItem instanceof NamedItem) { return ((NamedItem) selectedItem).getName(); } - else { - return ("New"); - } - } - - /** - * Sets the application configuration in the coplet instance data. - * @param coplet the coplet instance data - */ - private void setApplicationConfig(CopletInstanceData coplet) { - try { - PortalApplicationConfigFactory factory = - PortalApplicationConfigFactory.getInstance(resolver); - - coplet.setAttribute( - ProxyTransformer.CONFIG, - factory.getConfig(coplet.getCopletData().getId())); - } - catch (ProcessingException pe) { - getLogger().error( - "Error while getting portal application configuration for coplet " - + coplet.getId(), - pe); - } - } - - /** - * Called when user logs in to the portal. - */ - public void login(CopletInstanceData coplet) { - getLogger().info("ApplicationCopletAdapter:login"); - setApplicationConfig(coplet); - } - - /** - * Called when user logs out from the portal. - */ - public void logout(CopletInstanceData coplet) { - getLogger().info("ApplicationCopletAdapter:logout"); + return ("New"); } /** Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java?view=diff&rev=111972&p1=cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java&r1=111971&p2=cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java&r2=111972 ============================================================================== --- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java (original) +++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java Wed Dec 15 06:58:52 2004 @@ -38,7 +38,7 @@ import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.portal.Constants; import org.apache.cocoon.portal.PortalService; -import org.apache.cocoon.portal.application.PortalApplicationConfig; +import org.apache.cocoon.portal.coplet.CopletData; import org.apache.cocoon.portal.coplet.CopletInstanceData; import org.apache.cocoon.portal.profile.ProfileManager; import org.apache.cocoon.transformation.AbstractTransformer; @@ -85,7 +85,6 @@ public static final String COOKIE = "cookie"; public static final String START_URI = "start-uri"; public static final String LINK = "link"; - public static final String CONFIG = "config"; public static final String DOCUMENT_BASE = "documentbase"; /** @@ -163,40 +162,37 @@ /** * @see org.apache.cocoon.sitemap.SitemapModelComponent#setup(SourceResolver, Map, String, Parameters) */ - public void setup( - SourceResolver resolver, - Map objectModel, - String src, - Parameters parameters) - throws ProcessingException, SAXException, IOException { + public void setup(SourceResolver resolver, + Map objectModel, + String src, + Parameters parameters) + throws ProcessingException, SAXException, IOException { - request = ObjectModelHelper.getRequest(objectModel); + this.request = ObjectModelHelper.getRequest(objectModel); - copletInstanceData = - getInstanceData(this.manager, objectModel, parameters); + this.copletInstanceData = getInstanceData(this.manager, objectModel, parameters); - PortalApplicationConfig pac = - (PortalApplicationConfig) copletInstanceData.getAttribute(CONFIG); + final CopletData copletData = this.copletInstanceData.getCopletData(); + + final String startURI = (String)copletData.getAttribute(START_URI); - String startURI = pac.getAttribute(START_URI); + this.link = (String) this.copletInstanceData.getAttribute(LINK); - link = (String) copletInstanceData.getAttribute(LINK); + this.documentBase = (String) this.copletInstanceData.getAttribute(DOCUMENT_BASE); - documentBase = (String) copletInstanceData.getAttribute(DOCUMENT_BASE); - - if (link == null) { - link = startURI; + if (this.link == null) { + this.link = startURI; } if (documentBase == null) { - documentBase = link.substring(0, link.lastIndexOf('/') + 1); + documentBase = this.link.substring(0, this.link.lastIndexOf('/') + 1); copletInstanceData.setAttribute(DOCUMENT_BASE, documentBase); } - String encodingString = pac.getAttribute("encoding"); - configuredEncoding = encodingConstantFromString(encodingString); - userAgent = pac.getAttribute("user-agent"); - envelopeTag = parameters.getParameter("envelope-tag", envelopeTag); + String encodingString = (String)copletData.getAttribute("encoding"); + this.configuredEncoding = encodingConstantFromString(encodingString); + this.userAgent = (String)copletData.getAttribute("user-agent"); + this.envelopeTag = parameters.getParameter("envelope-tag", envelopeTag); if (envelopeTag == null) { throw new ProcessingException("Can not initialize RSFHtmlTransformer - sitemap parameter envelope-tag missing"); @@ -584,9 +580,7 @@ + documentBaseURL.getAuthority() + uri; } - else { - return documentBaseURL.toExternalForm() + uri; - } + return documentBaseURL.toExternalForm() + uri; } public static CopletInstanceData getInstanceData(ServiceManager manager,
