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/19 15:22:17 UTC
svn commit: r509211 [1/2] - in /cocoon/trunk/blocks/cocoon-portal:
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/support/
coc...
Author: cziegeler
Date: Mon Feb 19 06:22:15 2007
New Revision: 509211
URL: http://svn.apache.org/viewvc?view=rev&rev=509211
Log:
Start converting renderer aspects to spring.
Added:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/borderless-window.xconf (with props)
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/column.xconf (with props)
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/decorated-frame.xconf (with props)
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/frame.xconf (with props)
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/link.xconf (with props)
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/linktab.xconf (with props)
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/nowindow.xconf (with props)
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/rawtab.xconf (with props)
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/row.xconf (with props)
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/tab.xconf (with props)
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/window.xconf (with props)
Removed:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/basket-sample.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/renderers/
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/coplets/basket/
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/basket/
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/basic/images/basket.gif
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/common/images/basket.gif
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/modern/images/basket.gif
Modified:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/support/RendererAspectChain.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PageLabelProfileManagerAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/PageLabelLinkService.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/AspectsBeanDefinitionParser.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/PortalNamespaceHandler.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/cocoon-portal-components.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/portal.roles
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/cocoon-portal-sample.xconf
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-sample/src/main/resources/COB-INF/profiles/copletdefinition/portal.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/basic/styles/borderless-window.xsl
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/basic/styles/window.xsl
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/common/styles/borderless-window.xsl
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/common/styles/window.xsl
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/modern/styles/borderless-window.xsl
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/modern/styles/window.xsl
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java?view=diff&rev=509211&r1=509210&r2=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java Mon Feb 19 06:22:15 2007
@@ -21,7 +21,7 @@
import org.apache.cocoon.portal.PortalException;
import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect;
import org.apache.cocoon.portal.om.CopletInstance;
-import org.apache.cocoon.portal.util.AbstractComponent;
+import org.apache.cocoon.portal.util.AbstractBean;
/**
* Base class for renderer aspects.
@@ -29,7 +29,7 @@
* @version $Id$
*/
public abstract class AbstractAspect
- extends AbstractComponent
+ extends AbstractBean
implements RendererAspect {
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java?view=diff&rev=509211&r1=509210&r2=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java Mon Feb 19 06:22:15 2007
@@ -95,10 +95,9 @@
protected boolean enableMaximized;
/**
- * @see org.apache.avalon.framework.activity.Initializable#initialize()
+ * Initialize this component.
*/
- public void initialize() throws Exception {
- super.initialize();
+ public void init() {
this.enableFullScreen = this.portalService.getConfigurationAsBoolean(Constants.CONFIGURATION_FULL_SCREEN_ENABLED, Constants.DEFAULT_CONFIGURATION_FULL_SCREEN_ENABLED);
this.enableMaximized = this.portalService.getConfigurationAsBoolean(Constants.CONFIGURATION_MAXIMIZED_ENABLED, Constants.DEFAULT_CONFIGURATION_MAXIMIZED_ENABLED);
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java?view=diff&rev=509211&r1=509210&r2=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java Mon Feb 19 06:22:15 2007
@@ -18,23 +18,19 @@
import java.io.IOException;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.HashMap;
import java.util.Properties;
import javax.xml.transform.Transformer;
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.sax.TransformerHandler;
-import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
import org.apache.cocoon.portal.PortalException;
@@ -84,11 +80,11 @@
* <tr><th>xslt-processor-role</th><td></td><td>req</td><td>String</td><td><code>null</code></td></tr>
* </tbody></table>
*
+ * TODO - Remove all dependencies to Avalon.
* @version $Id$
*/
public class XSLTAspect
- extends AbstractAspect
- implements Configurable {
+ extends AbstractAspect {
protected List variables = new ArrayList();
@@ -98,20 +94,18 @@
/** Source resolver for resolving the stylesheets. */
protected SourceResolver resolver;
- /**
- * @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
- */
- public void configure(Configuration config) throws ConfigurationException {
- Configuration parameterItems = config.getChild("parameters", false);
- if (parameterItems != null) {
- this.parameters = new HashMap();
- final Parameters params = Parameters.fromConfiguration(parameterItems);
- final String[] names = params.getNames();
- for(int i=0; i<names.length; i++) {
- final String value = params.getParameter(names[i], null);
- this.parameters.put(names[i], value);
- }
- }
+ protected ServiceManager serviceManager;
+
+ public void setServiceManager(ServiceManager sm) {
+ this.serviceManager = sm;
+ }
+
+ public void setSourceResolver(SourceResolver resolver) {
+ this.resolver = resolver;
+ }
+
+ public void setXsltParameters(Map p) {
+ this.parameters = p;
}
/**
@@ -127,7 +121,7 @@
Source stylesheet = null;
try {
stylesheet = this.resolver.resolveURI(this.getStylesheetURI(config, layout));
- processor = (XSLTProcessor) this.manager.lookup(config.xsltRole);
+ processor = (XSLTProcessor) this.serviceManager.lookup(config.xsltRole);
TransformerHandler transformer = processor.getTransformerHandler(stylesheet);
// Pass configured parameters to the stylesheet.
if (config.parameters.size() > 0) {
@@ -165,7 +159,7 @@
throw new SAXException("Unable to lookup component.", ce);
} finally {
this.resolver.release(stylesheet);
- this.manager.release(processor);
+ this.serviceManager.release(processor);
}
}
@@ -176,7 +170,7 @@
if ( stylesheet != null ) {
VariableResolver variableResolver = null;
try {
- variableResolver = VariableResolverFactory.getResolver(stylesheet, this.manager);
+ variableResolver = VariableResolverFactory.getResolver(stylesheet, this.serviceManager);
stylesheet = variableResolver.resolve(objectModel);
} catch (PatternException pe) {
throw new SAXException("Unknown pattern for stylesheet " + stylesheet, pe);
@@ -223,7 +217,7 @@
pc.xsltRole = configuration.getProperty("xslt-processor-role", XSLTProcessor.ROLE);
String stylesheet = configuration.getProperty("style", null);
try {
- pc.stylesheet = VariableResolverFactory.getResolver(stylesheet, this.manager);
+ pc.stylesheet = VariableResolverFactory.getResolver(stylesheet, this.serviceManager);
} catch (PatternException pe) {
throw new PortalException("Unknown pattern for stylesheet " + stylesheet, pe);
}
@@ -234,7 +228,7 @@
final Map.Entry current = (Map.Entry)i.next();
try {
VariableResolver variableResolver =
- VariableResolverFactory.getResolver(current.getValue().toString(), this.manager);
+ VariableResolverFactory.getResolver(current.getValue().toString(), this.serviceManager);
this.variables.add(variableResolver);
pc.parameters.put(current.getKey(), variableResolver);
} catch (PatternException e) {
@@ -246,26 +240,15 @@
}
/**
- * @see org.apache.cocoon.portal.util.AbstractComponent#service(org.apache.avalon.framework.service.ServiceManager)
- */
- public void service(ServiceManager aManager) throws ServiceException {
- super.service(aManager);
- this.resolver = (SourceResolver)this.manager.lookup(SourceResolver.ROLE);
- }
-
- /**
- * @see org.apache.avalon.framework.activity.Disposable#dispose()
+ * Destroy this component.
*/
- public void dispose() {
- if ( this.manager != null ) {
+ public void destroy() {
+ if ( this.serviceManager != null ) {
Iterator vars = this.variables.iterator();
while ( vars.hasNext() ) {
ContainerUtil.dispose(vars.next());
}
this.variables.clear();
- this.manager.release(this.resolver);
- this.resolver = null;
}
- super.dispose();
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/support/RendererAspectChain.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/support/RendererAspectChain.java?view=diff&rev=509211&r1=509210&r2=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/support/RendererAspectChain.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/support/RendererAspectChain.java Mon Feb 19 06:22:15 2007
@@ -46,8 +46,9 @@
/** The list of the configuration objects for each renderer aspects. */
protected final List configs = new ArrayList(3);
- public RendererAspectChain(Class aClass) {
- super(aClass);
+ public RendererAspectChain(Class aClass, List aspects, List properties)
+ throws PortalException {
+ super(aClass, aspects, properties);
}
public Iterator getConfigurationIterator() {
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java?view=diff&rev=509211&r1=509210&r2=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java Mon Feb 19 06:22:15 2007
@@ -16,23 +16,13 @@
*/
package org.apache.cocoon.portal.layout.renderer.impl;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.portal.PortalException;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.layout.renderer.Renderer;
-import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect;
-import org.apache.cocoon.portal.layout.renderer.aspect.impl.support.RendererContextImpl;
import org.apache.cocoon.portal.layout.renderer.aspect.impl.support.RendererAspectChain;
+import org.apache.cocoon.portal.layout.renderer.aspect.impl.support.RendererContextImpl;
import org.apache.cocoon.portal.om.Layout;
import org.apache.cocoon.portal.om.LayoutException;
-import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.cocoon.portal.util.AbstractBean;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -50,18 +40,18 @@
* @version $Id$
*/
public class AspectRenderer
- extends AbstractLogEnabled
- implements Renderer, Serviceable, Configurable, Disposable, ThreadSafe {
-
- protected ServiceManager manager;
+ extends AbstractBean
+ implements Renderer {
+ /** The aspect chain for rendering. */
protected RendererAspectChain chain;
/**
- * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
+ * Set the event chain.
+ * @param a A chain.
*/
- public void service(ServiceManager aManager) throws ServiceException {
- this.manager = aManager;
+ public void setAspectChain(RendererAspectChain a) {
+ this.chain = a;
}
/**
@@ -72,29 +62,4 @@
final RendererContextImpl renderContext = new RendererContextImpl(service, this.chain);
renderContext.invokeNext(layout, handler);
}
-
- /**
- * @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
- */
- public void configure(Configuration conf) throws ConfigurationException {
- try {
- this.chain = new RendererAspectChain(RendererAspect.class);
- this.chain.configure(this.manager, conf);
- } catch (PortalException ce) {
- throw new ConfigurationException("Unable configure renderer aspects.", ce);
- }
- }
-
- /**
- * @see org.apache.avalon.framework.activity.Disposable#dispose()
- */
- public void dispose() {
- if (this.manager != null) {
- if ( this.chain != null) {
- this.chain.dispose( this.manager );
- this.chain = null;
- }
- this.manager = null;
- }
- }
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PageLabelProfileManagerAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PageLabelProfileManagerAspect.java?view=diff&rev=509211&r1=509210&r2=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PageLabelProfileManagerAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PageLabelProfileManagerAspect.java Mon Feb 19 06:22:15 2007
@@ -18,19 +18,20 @@
import java.util.Collection;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.portal.om.CompositeLayout;
import org.apache.cocoon.portal.om.Item;
import org.apache.cocoon.portal.om.Layout;
import org.apache.cocoon.portal.om.NamedItem;
import org.apache.cocoon.portal.services.aspects.ProfileManagerAspect;
import org.apache.cocoon.portal.services.aspects.ProfileManagerAspectContext;
+import org.apache.cocoon.portal.util.AbstractBean;
/**
* $Id$
*/
public class PageLabelProfileManagerAspect
- implements ProfileManagerAspect, ThreadSafe {
+ extends AbstractBean
+ implements ProfileManagerAspect {
/**
* @see org.apache.cocoon.portal.services.aspects.ProfileManagerAspect#prepareCopletDefinitions(org.apache.cocoon.portal.services.aspects.ProfileManagerAspectContext, java.util.Collection)
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/PageLabelLinkService.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/PageLabelLinkService.java?view=diff&rev=509211&r1=509210&r2=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/PageLabelLinkService.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/PageLabelLinkService.java Mon Feb 19 06:22:15 2007
@@ -27,8 +27,6 @@
import org.apache.cocoon.portal.om.Item;
import org.apache.cocoon.portal.om.NamedItem;
import org.apache.cocoon.util.NetUtils;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
/**
* The PageLabelLinkService generates links for named items defined in the layout portal.xml.
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=509211&r1=509210&r2=509211
==============================================================================
--- 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 Mon Feb 19 06:22:15 2007
@@ -44,8 +44,16 @@
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;
}
/**
@@ -53,7 +61,7 @@
*/
public BeanDefinition parse(Element element, ParserContext parserContext) {
// create a new bean definition for the aspect chain
- RootBeanDefinition beanDef = this.createBeanDefinition(AspectChain.class, null, false);
+ RootBeanDefinition beanDef = this.createBeanDefinition(this.aspectChainClass, null, false);
final ManagedList aspectBeans = new ManagedList();
aspectBeans.setSource(parserContext.getReaderContext().extractSource(element));
final List aspectProperties = new ArrayList();
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=509211&r1=509210&r2=509211
==============================================================================
--- 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 Mon Feb 19 06:22:15 2007
@@ -18,6 +18,7 @@
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;
@@ -33,7 +34,7 @@
*/
public void init() {
this.registerBeanDefinitionParser("event-aspects", new AspectsBeanDefinitionParser(EventAspect.class.getName()));
- this.registerBeanDefinitionParser("renderer-aspects", new AspectsBeanDefinitionParser(RendererAspect.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()));
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/cocoon-portal-components.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/cocoon-portal-components.xml?view=diff&rev=509211&r1=509210&r2=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/cocoon-portal-components.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/cocoon-portal-components.xml Mon Feb 19 06:22:15 2007
@@ -39,6 +39,59 @@
</bean>
<!--+
+ | Renderer Aspects
+ |
+ +-->
+ <bean name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect.composite-content"
+ class="org.apache.cocoon.portal.layout.renderer.aspect.impl.CompositeContentAspect"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton"/>
+
+ <bean name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect.tab-content"
+ class="org.apache.cocoon.portal.layout.renderer.aspect.impl.TabContentAspect"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton"/>
+
+ <bean name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect.window"
+ class="org.apache.cocoon.portal.layout.renderer.aspect.impl.WindowAspect"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton" init-method="init"/>
+
+ <!--+
+ | This aspect can be used to render the remove button.
+ +-->
+ <bean name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect.coplet-removing"
+ class="org.apache.cocoon.portal.layout.renderer.aspect.impl.RemovableAspect"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton"/>
+
+ <!--+
+ | This aspect can be used to render cinclude statements that will be used to include
+ | the coplet content, use the coplet aspect below to directly stream the content.
+ +-->
+ <bean name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect.coplet-cinclude"
+ class="org.apache.cocoon.portal.layout.renderer.aspect.impl.CIncludeCopletAspect"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton"/>
+
+ <!--+
+ | This aspect can be used to render the content of the coplet.
+ +-->
+ <bean name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect.coplet"
+ class="org.apache.cocoon.portal.layout.renderer.aspect.impl.DefaultCopletAspect"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton"/>
+
+ <bean name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect.frame"
+ class="org.apache.cocoon.portal.layout.renderer.aspect.impl.FrameAspect"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton"/>
+
+ <bean name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect.xslt"
+ class="org.apache.cocoon.portal.layout.renderer.aspect.impl.XSLTAspect"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton" destroy-method="destroy">
+ <property name="serviceManager" ref="org.apache.avalon.framework.service.ServiceManager"/>
+ <property name="sourceResolver" ref="org.apache.excalibur.source.SourceResolver"/>
+ </bean>
+
+ <bean name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect-parameter"
+ class="org.apache.cocoon.portal.layout.renderer.aspect.impl.ParameterAspect"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton"/>
+
+ <!--+
| Portal Manager.
|
+-->
@@ -116,7 +169,9 @@
<bean id="org.apache.cocoon.portal.event.aspect.EventAspect.page-label"
class="org.apache.cocoon.portal.event.aspect.impl.PageLabelEventAspect"
- parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton"/>
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
+ <property name="pageLabelManager" ref="org.apache.cocoon.portal.impl.PageLabelManager"/>
+ </bean>
<!--+
| This aspect sets headers on the response telling the client to not cache
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/portal.roles
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/portal.roles?view=diff&rev=509211&r1=509210&r2=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/portal.roles (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/portal.roles Mon Feb 19 06:22:15 2007
@@ -32,52 +32,6 @@
<alias role="org.apache.cocoon.portal.layout.renderer.Renderer" shorthand="renderer"/>
<!--+
- | Renderer Aspects
- |
- +-->
- <!-- Legacy service selector. -->
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectSelector"
- default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
-
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/composite-content"
- default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.CompositeContentAspect"/>
-
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/tab-content"
- default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.TabContentAspect"/>
-
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/window"
- default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.WindowAspect"/>
-
- <!--+
- | This aspect can be used to render the remove button.
- +-->
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/coplet-removing"
- default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.RemovableAspect"/>
-
- <!--+
- | This aspect can be used to render cinclude statements that will be used to include
- | the coplet content, use the coplet aspect below to directly stream the content.
- +-->
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/coplet-cinclude"
- default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.CIncludeCopletAspect"/>
-
- <!--+
- | This aspect can be used to render the content of the coplet.
- +-->
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/coplet"
- default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.DefaultCopletAspect"/>
-
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/frame"
- default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.FrameAspect"/>
-
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/xslt"
- default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.XSLTAspect"/>
-
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/parameter"
- default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.ParameterAspect"/>
-
-
- <!--+
| Components.
|
+-->
@@ -172,14 +126,6 @@
+-->
<role name="org.apache.cocoon.portal.profile.ProfileManager"
shorthand="portal-profile-manager"/>
-
- <!--+
- | Profile Manager Aspects
- |
- +-->
- <!-- Legacy service selector. -->
- <role name="org.apache.cocoon.portal.profile.ProfileManagerAspectSelector"
- default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
<!--+
| Deployment Manager
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/cocoon-portal-sample.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/cocoon-portal-sample.xconf?view=diff&rev=509211&r1=509210&r2=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/cocoon-portal-sample.xconf (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/cocoon-portal-sample.xconf Mon Feb 19 06:22:15 2007
@@ -43,9 +43,6 @@
<!-- We use Castor for persisting/mapping the profiles to XML: -->
<include src="resource://org/apache/cocoon/portal/persistence/castor/portal-castor.roles"/>
- <!-- Include all renderers: -->
- <include pattern="*.xconf" dir="renderers"/>
-
<portal-service>
<portal name="portal">
<!-- Configuration: -->
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=509211&r1=509210&r2=509211
==============================================================================
--- 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 Mon Feb 19 06:22:15 2007
@@ -33,6 +33,9 @@
<!-- If you don't need WSRP support, you can remove the following include -->
<import resource="classpath:org/apache/cocoon/portal/wsrp/cocoon-portal-wsrp-components.xml"/>
+ <!-- Include renderers: -->
+ <import resource="renderers/*.xml"/>
+
<!--+
| Portal Link Service.
|
Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/borderless-window.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/borderless-window.xconf?view=auto&rev=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/borderless-window.xconf (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/borderless-window.xconf Mon Feb 19 06:22:15 2007
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<!--+
+ |
+ | @version $Id$
+ +-->
+<components>
+ <renderer name="borderless-window"
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
+ <aspects>
+ <aspect type="xslt">
+ <parameter name="style" value="{portal-skin:skin.basepath}/styles/borderless-window.xsl"/>
+ </aspect>
+ <aspect type="parameter">
+ <parameter name="tag-name" value="window"/>
+ </aspect>
+ <aspect type="window">
+ <parameter name="root-tag" value="false"/>
+ </aspect>
+ <aspect type="coplet-cinclude"/>
+ </aspects>
+ </renderer>
+</components>
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/borderless-window.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/borderless-window.xconf
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/column.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/column.xconf?view=auto&rev=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/column.xconf (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/column.xconf Mon Feb 19 06:22:15 2007
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<!--+
+ |
+ | @version $Id$
+ +-->
+<components>
+ <renderer name="column"
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
+ <aspects>
+ <aspect type="xslt">
+ <parameter name="style" value="{portal-skin:skin.basepath}/styles/column.xsl"/>
+ </aspect>
+ <aspect type="parameter">
+ <parameter name="tag-name" value="column-layout"/>
+ </aspect>
+ <aspect type="composite-content">
+ <parameter name="root-tag" value="false"/>
+ </aspect>
+ </aspects>
+ </renderer>
+</components>
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/column.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/column.xconf
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/decorated-frame.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/decorated-frame.xconf?view=auto&rev=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/decorated-frame.xconf (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/decorated-frame.xconf Mon Feb 19 06:22:15 2007
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<!--+
+ |
+ | @version $Id$
+ +-->
+<components>
+ <renderer name="decorated-frame"
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
+ <aspects>
+ <aspect type="xslt">
+ <parameter name="style" value="{portal-skin:skin.basepath}/styles/frame.xsl"/>
+ </aspect>
+ <aspect type="parameter">
+ <parameter name="tag-name" value="frame"/>
+ </aspect>
+ <aspect type="frame">
+ <parameter name="store" value="request"/>
+ </aspect>
+ </aspects>
+ </renderer>
+</components>
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/decorated-frame.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/decorated-frame.xconf
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/frame.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/frame.xconf?view=auto&rev=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/frame.xconf (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/frame.xconf Mon Feb 19 06:22:15 2007
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<!--+
+ |
+ | @version $Id$
+ +-->
+<components>
+ <renderer name="frame"
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
+ <aspects>
+ <aspect type="frame">
+ <parameter name="store" value="request"/>
+ </aspect>
+ </aspects>
+ </renderer>
+</components>
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/frame.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/frame.xconf
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/link.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/link.xconf?view=auto&rev=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/link.xconf (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/link.xconf Mon Feb 19 06:22:15 2007
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<!--+
+ |
+ | @version $Id$
+ +-->
+<components>
+ <renderer name="link"
+ class="org.apache.cocoon.portal.layout.renderer.impl.DefaultLinkRenderer"/>
+</components>
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/link.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/link.xconf
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/linktab.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/linktab.xconf?view=auto&rev=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/linktab.xconf (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/linktab.xconf Mon Feb 19 06:22:15 2007
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<!--+
+ |
+ | @version $Id$
+ +-->
+<components>
+ <renderer name="linktab"
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
+ <aspects>
+ <aspect type="xslt">
+ <parameter name="style" value="{portal-skin:skin.basepath}/styles/linktab.xsl"/>
+ </aspect>
+ <aspect type="parameter">
+ <parameter name="tag-name" value="linktab-layout"/>
+ </aspect>
+ <aspect type="tab-content">
+ <parameter name="root-tag" value="false"/>
+ <parameter name="store" value="session"/>
+ </aspect>
+ </aspects>
+ </renderer>
+</components>
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/linktab.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/linktab.xconf
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/nowindow.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/nowindow.xconf?view=auto&rev=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/nowindow.xconf (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/nowindow.xconf Mon Feb 19 06:22:15 2007
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<!--+
+ |
+ | @version $Id$
+ +-->
+<components>
+ <renderer name="nowindow"
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
+ <aspects>
+ <aspect type="xslt">
+ <parameter name="style" value="{portal-skin:skin.basepath}/styles/nowindow.xsl"/>
+ </aspect>
+ <aspect type="window"/>
+ <aspect type="coplet-cinclude"/>
+ </aspects>
+ </renderer>
+</components>
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/nowindow.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/nowindow.xconf
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/rawtab.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/rawtab.xconf?view=auto&rev=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/rawtab.xconf (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/rawtab.xconf Mon Feb 19 06:22:15 2007
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<!--+
+ |
+ | @version $Id$
+ +-->
+<components>
+ <renderer name="rawtab"
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
+ <aspects>
+ <aspect type="parameter">
+ <parameter name="tag-name" value="tab-layout"/>
+ </aspect>
+ <aspect type="tab-content">
+ <parameter name="root-tag" value="false"/>
+ <parameter name="store" value="session"/>
+ </aspect>
+ </aspects>
+ </renderer>
+</components>
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/rawtab.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/rawtab.xconf
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/row.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/row.xconf?view=auto&rev=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/row.xconf (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/row.xconf Mon Feb 19 06:22:15 2007
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<!--+
+ |
+ | @version $Id$
+ +-->
+<components>
+ <renderer name="row"
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
+ <aspects>
+ <aspect type="xslt">
+ <parameter name="style" value="{portal-skin:skin.basepath}/styles/row.xsl"/>
+ </aspect>
+ <aspect type="parameter">
+ <parameter name="tag-name" value="row-layout"/>
+ </aspect>
+ <aspect type="composite-content">
+ <parameter name="root-tag" value="false"/>
+ </aspect>
+ </aspects>
+ </renderer>
+</components>
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/row.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/row.xconf
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/tab.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/tab.xconf?view=auto&rev=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/tab.xconf (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/tab.xconf Mon Feb 19 06:22:15 2007
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<!--+
+ |
+ | @version $Id$
+ +-->
+<components>
+ <renderer name="tab"
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
+ <aspects>
+ <aspect type="xslt">
+ <parameter name="style" value="{portal-skin:skin.basepath}/styles/tab.xsl"/>
+ </aspect>
+ <aspect type="parameter">
+ <parameter name="tag-name" value="tab-layout"/>
+ </aspect>
+ <aspect type="tab-content">
+ <parameter name="root-tag" value="false"/>
+ <parameter name="store" value="session"/>
+ </aspect>
+ </aspects>
+ </renderer>
+</components>
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/tab.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/tab.xconf
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/window.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/window.xconf?view=auto&rev=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/window.xconf (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/window.xconf Mon Feb 19 06:22:15 2007
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<!--+
+ |
+ | @version $Id$
+ +-->
+<components>
+ <renderer name="window"
+ class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer">
+ <aspects>
+ <aspect type="xslt">
+ <parameter name="style" value="{portal-skin:skin.basepath}/styles/window.xsl"/>
+ </aspect>
+ <aspect type="parameter">
+ <parameter name="tag-name" value="window"/>
+ </aspect>
+ <aspect type="window">
+ <parameter name="root-tag" value="false"/>
+ </aspect>
+ <aspect type="coplet-cinclude"/>
+ </aspects>
+ </renderer>
+</components>
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/window.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/renderers/window.xconf
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletdefinition/portal.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletdefinition/portal.xml?view=diff&rev=509211&r1=509210&r2=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletdefinition/portal.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletdefinition/portal.xml Mon Feb 19 06:22:15 2007
@@ -263,175 +263,6 @@
</attribute>
</coplet-definition>
- <!--
- + The basket coplets
- + The uri's for these coplets have to be absolut, so you have to use cocoon://!
- -->
- <coplet-definition id="BasketContent">
- <title>Basket Item</title>
- <coplet-type>URICoplet</coplet-type>
- <attribute>
- <name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://blocks/cocoon-portal-sample/coplets/basket/content</value>
- </attribute>
- </coplet-definition>
- <coplet-definition id="BasketAdmin">
- <title>Basket Administration</title>
- <coplet-type>URICoplet</coplet-type>
- <attribute>
- <name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://blocks/cocoon-portal-sample/coplets/basket/basket-admin</value>
- </attribute>
- </coplet-definition>
- <coplet-definition id="Basket">
- <title>Basket</title>
- <coplet-type>URICoplet</coplet-type>
- <attribute>
- <name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://blocks/cocoon-portal-sample/coplets/basket/basket</value>
- </attribute>
- </coplet-definition>
- <coplet-definition id="Basket_admin">
- <title>Basket</title>
- <coplet-type>URICoplet</coplet-type>
- <attribute>
- <name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://blocks/cocoon-portal-sample/coplets/basket/basket.admin</value>
- </attribute>
- </coplet-definition>
- <coplet-definition id="BasketSampleStaticCoplet">
- <title>Static Coplet</title>
- <coplet-type>URICoplet</coplet-type>
- <attribute>
- <name>group</name>
- <value xsi:type="java:java.lang.String">document</value>
- </attribute>
- <attribute>
- <name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://blocks/cocoon-portal-sample/coplets/basket/staticcoplet.add.preflow</value>
- </attribute>
- </coplet-definition>
- <coplet-definition id="BasketSampleCopletWithAttribute">
- <title>Coplet with Attribute</title>
- <coplet-type>URICoplet</coplet-type>
- <attribute>
- <name>group</name>
- <value xsi:type="java:java.lang.String">document</value>
- </attribute>
- <attribute>
- <name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://blocks/cocoon-portal-sample/coplets/basket/copletwithattr.add.preflow</value>
- </attribute>
- </coplet-definition>
- <coplet-definition id="BasketSampleCopletWithInlineProcess">
- <title>Coplet with Inline Process</title>
- <coplet-type>URICoplet</coplet-type>
- <attribute>
- <name>group</name>
- <value xsi:type="java:java.lang.String">document</value>
- </attribute>
- <attribute>
- <name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://blocks/cocoon-portal-sample/coplets/basket/copletwithinline.add.preflow</value>
- </attribute>
- </coplet-definition>
- <coplet-definition id="BasketSampleCopletWithInputProcess">
- <title>Coplet with Input Processing</title>
- <coplet-type>URICoplet</coplet-type>
- <attribute>
- <name>group</name>
- <value xsi:type="java:java.lang.String">notepad</value>
- </attribute>
- <attribute>
- <name>buffer</name>
- <value xsi:type="java:java.lang.Boolean">true</value>
- </attribute>
- <attribute>
- <name>handleParameters</name>
- <value xsi:type="java:java.lang.Boolean">true</value>
- </attribute>
- <attribute>
- <name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://blocks/cocoon-portal-sample/coplets/basket/application</value>
- </attribute>
- <attribute>
- <name>temporary:application-uri</name>
- <value xsi:type="java:java.lang.String">cocoon://blocks/cocoon-portal-sample/coplets/basket/copletwithinput.add.flow</value>
- </attribute>
- </coplet-definition>
- <coplet-definition id="BasketSampleCopletWithInputProcessShow">
- <title>Show Input</title>
- <coplet-type>URICoplet</coplet-type>
- <attribute>
- <name>group</name>
- <value xsi:type="java:java.lang.String">notepad</value>
- </attribute>
- <attribute>
- <name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://blocks/cocoon-portal-sample/coplets/basket/copletwithinputshow.changeTitle.preflow</value>
- </attribute>
- </coplet-definition>
- <coplet-definition id="BasketSampleCopletWithApp">
- <title>Coplet with Application</title>
- <coplet-type>URICoplet</coplet-type>
- <attribute>
- <name>group</name>
- <value xsi:type="java:java.lang.String">request</value>
- </attribute>
- <attribute>
- <name>buffer</name>
- <value xsi:type="java:java.lang.Boolean">true</value>
- </attribute>
- <attribute>
- <name>handleParameters</name>
- <value xsi:type="java:java.lang.Boolean">true</value>
- </attribute>
- <attribute>
- <name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://blocks/cocoon-portal-sample/coplets/basket/application</value>
- </attribute>
- <attribute>
- <name>temporary:application-uri</name>
- <value xsi:type="java:java.lang.String">cocoon://blocks/cocoon-portal-sample/coplets/basket/copletwithapp.add.flow</value>
- </attribute>
- </coplet-definition>
- <coplet-definition id="BasketSampleCopletList">
- <title>Coplet List</title>
- <coplet-type>URICoplet</coplet-type>
- <attribute>
- <name>group</name>
- <value xsi:type="java:java.lang.String">request</value>
- </attribute>
- <attribute>
- <name>buffer</name>
- <value xsi:type="java:java.lang.Boolean">true</value>
- </attribute>
- <attribute>
- <name>handleParameters</name>
- <value xsi:type="java:java.lang.Boolean">true</value>
- </attribute>
- <attribute>
- <name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://blocks/cocoon-portal-sample/coplets/basket/application</value>
- </attribute>
- <attribute>
- <name>temporary:application-uri</name>
- <value xsi:type="java:java.lang.String">cocoon://blocks/cocoon-portal-sample/coplets/basket/copletlist</value>
- </attribute>
- </coplet-definition>
- <coplet-definition id="BasketSampleCopletWithUpload">
- <title>Coplet with Input Process</title>
- <coplet-type>URICoplet</coplet-type>
- <attribute>
- <name>group</name>
- <value xsi:type="java:java.lang.String">folder</value>
- </attribute>
- <attribute>
- <name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://blocks/cocoon-portal-sample/coplets/basket/copletwithupload.add.preflow</value>
- </attribute>
- </coplet-definition>
-
<!--+
| JSR-168 portlets provided by Cocoon. If Cocoon is running in a different
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal.xml?view=diff&rev=509211&r1=509210&r2=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal.xml Mon Feb 19 06:22:15 2007
@@ -68,84 +68,4 @@
<coplet-instance id="PortalDemo_1">
<coplet-definition>PortalDemo</coplet-definition>
</coplet-instance>
-
- <!-- This is the basket sample
- -->
- <coplet-instance id="basket">
- <coplet-definition>Basket</coplet-definition>
- <attribute> <!-- which kinds are enabled for this user: briefcase, basker, folder? -->
- <name>basket:enabled-storages</name>
- <value xsi:type="java:java.lang.String">briefcase,basket,folder</value>
- </attribute>
- </coplet-instance>
-
- <coplet-instance id="basket_document">
- <coplet-definition>Basket</coplet-definition>
- <attribute>
- <name>type</name>
- <value xsi:type="java:java.lang.String">document</value>
- </attribute>
- </coplet-instance>
- <coplet-instance id="basket_request">
- <coplet-definition>Basket</coplet-definition>
- <attribute>
- <name>type</name>
- <value xsi:type="java:java.lang.String">request</value>
- </attribute>
- </coplet-instance>
- <coplet-instance id="basket_result">
- <coplet-definition>Basket</coplet-definition>
- <attribute>
- <name>type</name>
- <value xsi:type="java:java.lang.String">result</value>
- </attribute>
- </coplet-instance>
- <coplet-instance id="basket_notepad">
- <coplet-definition>Basket</coplet-definition>
- <attribute>
- <name>type</name>
- <value xsi:type="java:java.lang.String">notepad</value>
- </attribute>
- </coplet-instance>
- <coplet-instance id="basket_folder">
- <coplet-definition>Basket</coplet-definition>
- <attribute>
- <name>type</name>
- <value xsi:type="java:java.lang.String">folder</value>
- </attribute>
- </coplet-instance>
-
- <coplet-instance id="Basket_admin">
- <coplet-definition>Basket_admin</coplet-definition>
- </coplet-instance>
- <coplet-instance id="basket_content">
- <coplet-definition>BasketContent</coplet-definition>
- </coplet-instance>
- <coplet-instance id="BasketAdmin">
- <coplet-definition>BasketAdmin</coplet-definition>
- </coplet-instance>
- <coplet-instance id="basket_sample_1">
- <coplet-definition>BasketSampleStaticCoplet</coplet-definition>
- </coplet-instance>
- <coplet-instance id="basket_sample_2">
- <coplet-definition>BasketSampleCopletWithAttribute</coplet-definition>
- </coplet-instance>
- <coplet-instance id="basket_sample_3">
- <coplet-definition>BasketSampleCopletWithInlineProcess</coplet-definition>
- </coplet-instance>
- <coplet-instance id="basket_sample_4">
- <coplet-definition>BasketSampleCopletWithInputProcess</coplet-definition>
- </coplet-instance>
- <coplet-instance id="basket_sample_5">
- <coplet-definition>BasketSampleCopletWithApp</coplet-definition>
- </coplet-instance>
- <coplet-instance id="basket_sample_6">
- <coplet-definition>BasketSampleCopletWithUpload</coplet-definition>
- </coplet-instance>
- <coplet-instance id="basket_sample_7">
- <coplet-definition>BasketSampleCopletWithInputProcessShow</coplet-definition>
- </coplet-instance>
- <coplet-instance id="basket_sample_8">
- <coplet-definition>BasketSampleCopletList</coplet-definition>
- </coplet-instance>
</coplets>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal.xml?view=diff&rev=509211&r1=509210&r2=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal.xml Mon Feb 19 06:22:15 2007
@@ -191,141 +191,4 @@
</composite-layout>
</named-item>
- <named-item name="Basket">
- <!-- This is the basket demo. Usually you would only have the user
- tab for users and the admin tab for the admin and not both at
- the same time (But this is a demo...) -->
- <composite-layout type="tab" id="baskettab">
- <named-item name="List">
- <composite-layout type="row">
- <item>
- <composite-layout type="column">
- <item>
- <coplet-layout type="coplet">
- <coplet-instance>basket_sample_8</coplet-instance>
- </coplet-layout>
- </item>
- </composite-layout>
- </item>
- </composite-layout>
- </named-item>
- <named-item name="Input">
- <composite-layout type="row">
- <item>
- <composite-layout type="column">
- <item>
- <coplet-layout type="coplet">
- <coplet-instance>basket_sample_1</coplet-instance>
- </coplet-layout>
- </item>
- <item>
- <coplet-layout type="coplet" >
- <coplet-instance>basket_sample_2</coplet-instance>
- </coplet-layout>
- </item>
- </composite-layout>
- </item>
- <item>
- <composite-layout type="column">
- <item>
- <coplet-layout type="coplet">
- <coplet-instance>basket_sample_3</coplet-instance>
- </coplet-layout>
- </item>
- <item>
- <coplet-layout type="coplet" >
- <coplet-instance>basket_sample_4</coplet-instance>
- </coplet-layout>
- </item>
- </composite-layout>
- </item>
- <item>
- <composite-layout type="column">
- <item>
- <coplet-layout type="coplet">
- <coplet-instance>basket_sample_5</coplet-instance>
- </coplet-layout>
- </item>
- <item>
- <coplet-layout type="coplet">
- <coplet-instance>basket_sample_6</coplet-instance>
- </coplet-layout>
- </item>
- </composite-layout>
- </item>
- </composite-layout>
- </named-item>
- <named-item name="Content">
- <composite-layout type="row">
- <item>
- <composite-layout type="tab">
- <named-item name="All">
- <coplet-layout type="coplet">
- <coplet-instance>basket</coplet-instance>
- </coplet-layout>
- </named-item>
- <named-item name="Document">
- <coplet-layout type="coplet">
- <coplet-instance>basket_document</coplet-instance>
- </coplet-layout>
- </named-item>
- <named-item name="Request">
- <coplet-layout type="coplet">
- <coplet-instance>basket_request</coplet-instance>
- </coplet-layout>
- </named-item>
- <named-item name="Result">
- <coplet-layout type="coplet">
- <coplet-instance>basket_result</coplet-instance>
- </coplet-layout>
- </named-item>
- <named-item name="Notepad">
- <coplet-layout type="coplet">
- <coplet-instance>basket_notepad</coplet-instance>
- </coplet-layout>
- </named-item>
- <named-item name="Folder">
- <coplet-layout type="coplet">
- <coplet-instance>basket_folder</coplet-instance>
- </coplet-layout>
- </named-item>
- </composite-layout>
- </item>
- <item>
- <composite-layout type="column">
- <item>
- <coplet-layout type="coplet" id="basket_content">
- <coplet-instance>basketcontent</coplet-instance>
- </coplet-layout>
- </item>
- <item>
- <coplet-layout type="coplet">
- <coplet-instance>basket_sample_7</coplet-instance>
- </coplet-layout>
- </item>
- </composite-layout>
- </item>
- </composite-layout>
- </named-item>
- <named-item name="Admin">
- <composite-layout type="column">
- <item>
- <coplet-layout type="coplet" >
- <coplet-instance>BasketAdmin</coplet-instance>
- </coplet-layout>
- </item>
- <item>
- <coplet-layout type="coplet">
- <coplet-instance>Basket_admin</coplet-instance>
- </coplet-layout>
- </item>
- <item>
- <coplet-layout type="coplet" id="basket_content_admin">
- <coplet-instance>basket_content</coplet-instance>
- </coplet-layout>
- </item>
- </composite-layout>
- </named-item>
- </composite-layout>
- </named-item>
</composite-layout>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/basic/styles/borderless-window.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/basic/styles/borderless-window.xsl?view=diff&rev=509211&r1=509210&r2=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/basic/styles/borderless-window.xsl (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/basic/styles/borderless-window.xsl Mon Feb 19 06:22:15 2007
@@ -48,16 +48,6 @@
</b></font>
</td>
<td align="right" bgColor="{$bgColor}">
- <xsl:if test="basket-add-link">
- <a href="{basket-add-link}">
- <img src="images/basket.gif" border="0" alt="Add Link"/>
- </a>
- </xsl:if>
- <xsl:if test="basket-add-content">
- <a href="{basket-add-content}">
- <img src="images/basket.gif" border="0" alt="Add Content"/>
- </a>
- </xsl:if>
<xsl:if test="edit-uri">
<a href="{edit-uri}">
<img src="images/edit.gif" border="0" alt="Edit"/>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/basic/styles/window.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/basic/styles/window.xsl?view=diff&rev=509211&r1=509210&r2=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/basic/styles/window.xsl (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/basic/styles/window.xsl Mon Feb 19 06:22:15 2007
@@ -50,16 +50,6 @@
</font>
</td>
<td align="right" bgColor="{$bgColor}">
- <xsl:if test="basket-add-link">
- <a href="{basket-add-link}">
- <img src="images/basket.gif" border="0" alt="Add Link"/>
- </a>
- </xsl:if>
- <xsl:if test="basket-add-content">
- <a href="{basket-add-content}">
- <img src="images/basket.gif" border="0" alt="Add Content"/>
- </a>
- </xsl:if>
<xsl:if test="edit-uri">
<a href="{edit-uri}">
<img src="images/edit.gif" border="0" alt="Edit"/>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/common/styles/borderless-window.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/common/styles/borderless-window.xsl?view=diff&rev=509211&r1=509210&r2=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/common/styles/borderless-window.xsl (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/common/styles/borderless-window.xsl Mon Feb 19 06:22:15 2007
@@ -51,20 +51,6 @@
</td>
<td align="right" valign="middle" bgColor="{$bgColor}">
<table cellSpacing="0" cellpadding="0" border="0"><tbody><tr>
- <xsl:if test="basket-add-link">
- <td width="15">
- <a href="{basket-add-link}">
- <img src="images/basket.gif" border="0" alt="Add Link"/>
- </a>
- </td>
- </xsl:if>
- <xsl:if test="basket-add-content">
- <td width="15">
- <a href="{basket-add-content}">
- <img src="images/basket.gif" border="0" alt="Add Content"/>
- </a>
- </td>
- </xsl:if>
<xsl:if test="edit-uri">
<td width="15">
<a href="{edit-uri}">
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/common/styles/window.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/common/styles/window.xsl?view=diff&rev=509211&r1=509210&r2=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/common/styles/window.xsl (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/common/styles/window.xsl Mon Feb 19 06:22:15 2007
@@ -51,20 +51,6 @@
</td>
<td align="right" valign="middle" bgColor="{$bgColor}">
<table cellSpacing="0" cellpadding="0" border="0"><tbody><tr>
- <xsl:if test="basket-add-link">
- <td width="15">
- <a href="{basket-add-link}">
- <img src="images/basket.gif" border="0" alt="Add Link"/>
- </a>
- </td>
- </xsl:if>
- <xsl:if test="basket-add-content">
- <td width="15">
- <a href="{basket-add-content}">
- <img src="images/basket.gif" border="0" alt="Add Content"/>
- </a>
- </td>
- </xsl:if>
<xsl:if test="edit-uri">
<td width="15">
<a href="{edit-uri}">
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/modern/styles/borderless-window.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/modern/styles/borderless-window.xsl?view=diff&rev=509211&r1=509210&r2=509211
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/modern/styles/borderless-window.xsl (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/modern/styles/borderless-window.xsl Mon Feb 19 06:22:15 2007
@@ -36,20 +36,6 @@
</div>
<div class="coplet-icons" id="coplet-icons-{$copletId}">
<xsl:variable name="copletSize"><xsl:value-of select="coplet-size"/></xsl:variable>
- <xsl:if test="basket-add-link">
- <div class="coplet-icon basket-add-link" id="coplet-icon-basket-add-link-{$copletId}">
- <a href="{basket-add-link}">
- <img src="images/basket.gif" border="0" alt="Add Link"/>
- </a>
- </div>
- </xsl:if>
- <xsl:if test="basket-add-content">
- <div class="coplet-icon basket-add-content" id="coplet-icon-basket-add-content-{$copletId}">
- <a href="{basket-add-content}">
- <img src="images/basket.gif" border="0" alt="Add Content"/>
- </a>
- </div>
- </xsl:if>
<xsl:if test="edit-uri">
<div class="coplet-icon edit-uri" id="coplet-icon-edit-uri-{$copletId}">
<a href="{edit-uri}">