cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r314978 [1/2] - in /cocoon/blocks: portal-sample/trunk/samples/ portal/trunk/java/org/apache/cocoon/portal/authenticationfw/ portal/trunk/java/org/apache/cocoon/portal/layout/impl/ portal/trunk/java/org/apache/cocoon/portal/layout/renderer/...
Date Wed, 12 Oct 2005 17:50:16 GMT
Author: cziegeler
Date: Wed Oct 12 10:49:21 2005
New Revision: 314978

URL: http://svn.apache.org/viewcvs?rev=314978&view=rev
Log:
Add missing isAccessing action
More JavaDocs

Added:
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/authenticationfw/IsAccessingAction.java   (with props)
Modified:
    cocoon/blocks/portal-sample/trunk/samples/sitemap-auth.xmap
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/authenticationfw/LogoutAction.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/CompositeLayoutImpl.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutDescription.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/FrameLayout.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/LinkLayout.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/Renderer.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspectContext.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractActionAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCIncludeAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CIncludeCopletAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultCopletAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultRendererContext.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FullScreenCopletAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/HistoryAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RemovableAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RendererAspectChain.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/SizingAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/impl/DefaultLinkRenderer.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java

Modified: cocoon/blocks/portal-sample/trunk/samples/sitemap-auth.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/sitemap-auth.xmap?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/sitemap-auth.xmap (original)
+++ cocoon/blocks/portal-sample/trunk/samples/sitemap-auth.xmap Wed Oct 12 10:49:21 2005
@@ -50,6 +50,8 @@
     <map:actions>
       <map:action name="portal-login"
                   src="org.apache.cocoon.portal.authenticationfw.LoginAction"/>
+      <map:action name="portal-is-accessing"
+                  src="org.apache.cocoon.portal.authenticationfw.IsAccessingAction"/>
       <map:action name="portal-logout"
                   src="org.apache.cocoon.portal.authenticationfw.LogoutAction"/>
       <map:action name="portal-set-object-model"
@@ -195,6 +197,9 @@
           <map:parameter name="parameter_password" value="anonymous"/>
         </map:act>
       </map:act>
+
+      <!-- Inform the portal that a user is using the portal :) -->
+      <map:act type="portal-is-accessing"/>
 
       <!-- Test pipeline for portal engine -->
       <map:match pattern="portal">

Added: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/authenticationfw/IsAccessingAction.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/authenticationfw/IsAccessingAction.java?rev=314978&view=auto
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/authenticationfw/IsAccessingAction.java (added)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/authenticationfw/IsAccessingAction.java Wed Oct 12 10:49:21 2005
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed 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.authenticationfw;
+
+import java.util.Map;
+
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.environment.Redirector;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.portal.acting.AbstractPortalAction;
+import org.apache.cocoon.portal.event.user.UserEventUtil;
+import org.apache.cocoon.portal.profile.PortalUser;
+
+/**
+ * This action informs the portal about the current user.
+ *
+ * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
+ * @version $Id$
+ */
+public final class IsAccessingAction
+    extends AbstractPortalAction {
+
+    /**
+     * @see org.apache.cocoon.acting.Action#act(org.apache.cocoon.environment.Redirector, org.apache.cocoon.environment.SourceResolver, java.util.Map, java.lang.String, org.apache.avalon.framework.parameters.Parameters)
+     */
+    public Map act(Redirector redirector,
+                   SourceResolver resolver,
+                   Map objectModel,
+                   String source,
+                   Parameters par)
+    throws Exception {
+        if (this.getLogger().isDebugEnabled() ) {
+            this.getLogger().debug("Portal is-accessing action called.");
+        }
+
+        PortalUser user = User.getPortalUser(this.manager, this.portalService.getPortalName());
+        UserEventUtil.sendUserIsAccessingEvent(this.portalService, user);
+
+        return EMPTY_MAP;
+    }
+
+}

Propchange: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/authenticationfw/IsAccessingAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/authenticationfw/IsAccessingAction.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/authenticationfw/LogoutAction.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/authenticationfw/LogoutAction.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/authenticationfw/LogoutAction.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/authenticationfw/LogoutAction.java Wed Oct 12 10:49:21 2005
@@ -46,7 +46,7 @@
             this.getLogger().debug("Portal logout action called.");
         }
 
-        PortalUser user = this.portalService.getComponentManager().getProfileManager().getUser();
+        PortalUser user = User.getPortalUser(this.manager, this.portalService.getPortalName());
         UserEventUtil.sendUserWillLogoutEvent(this.portalService, user);
 
         return EMPTY_MAP;

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/CompositeLayoutImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/CompositeLayoutImpl.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/CompositeLayoutImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/CompositeLayoutImpl.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
+ *
  * Licensed 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.
@@ -28,11 +28,11 @@
 
 /**
  * A composite layout is a layout that contains other layouts.
- * 
+ *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public class CompositeLayoutImpl 
     extends AbstractLayout
@@ -42,14 +42,14 @@
 
     /** The class name of the items */
     protected String itemClassName;
-    
+
     /**
      * Constructor
      */
     public CompositeLayoutImpl() {
         // nothing to do
     }
-    
+
 	/**
 	 * Add indexed item to the itemList.
 	 * @param index index for the position inside the list
@@ -92,13 +92,16 @@
 	public final int getSize() {
 		return this.items.size();
 	}
-    
+
+    /**
+     * @see org.apache.cocoon.portal.layout.CompositeLayout#removeItem(org.apache.cocoon.portal.layout.Item)
+     */
     public final void removeItem(Item item) {
         this.items.remove(item);
         item.setParent(null);
     }
-    
-    /* (non-Javadoc)
+
+    /**
      * @see org.apache.cocoon.portal.layout.CompositeLayout#createNewItem()
      */
     public Item createNewItem() {
@@ -111,14 +114,14 @@
             return new Item();
         }
     }
-        
+
     /**
      * @return Returns the item class name.
      */
     public String getItemClassName() {
         return this.itemClassName;
     }
-    
+
     /**
      * @param value The item class name to set.
      */
@@ -126,19 +129,19 @@
         this.itemClassName = value;
     }
 
-    /* (non-Javadoc)
+    /**
      * @see java.lang.Object#clone()
      */
     protected Object clone() throws CloneNotSupportedException {
         CompositeLayoutImpl clone = (CompositeLayoutImpl)super.clone();
-        
+
         // we are not cloning the items
         clone.items = new ArrayList();
 
         return clone;
     }
-    
-    /* (non-Javadoc)
+
+    /*+
      * @see org.apache.cocoon.portal.layout.Layout#copy(java.util.Map)
      */
     public Layout copy() {
@@ -151,5 +154,4 @@
         }
         return clone;
     }
-    
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
+ *
  * Licensed 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.
@@ -21,40 +21,39 @@
 
 /**
  * A coplet layout holds a coplet.
- * 
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public final class CopletLayout extends AbstractLayout {
-    
-    private CopletInstanceData copletInstanceData;
-    
+
+    protected CopletInstanceData copletInstanceData;
+
     public void setCopletInstanceData(CopletInstanceData cid) {
         this.copletInstanceData = cid;
         if ( this.getId() == null ) {
             this.setId(cid.getId());
         }
     }
-    
+
     public CopletInstanceData getCopletInstanceData() {
         return this.copletInstanceData;
     }
 
-    /* (non-Javadoc)
+    /**
      * @see java.lang.Object#clone()
      */
     protected Object clone() throws CloneNotSupportedException {
         CopletLayout clone = (CopletLayout)super.clone();
-        
+
         clone.copletInstanceData = null;
-        
+
         return clone;
     }
-    
-    /* (non-Javadoc)
+
+    /**
      * @see org.apache.cocoon.portal.layout.Layout#copy()
      */
     public Layout copy() {
@@ -63,7 +62,7 @@
         if ( this.copletInstanceData != null ) {
             clone.copletInstanceData = this.copletInstanceData.copy();
         }
-            
+
         return clone;
     }
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutDescription.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutDescription.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutDescription.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutDescription.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
+ *
  * Licensed 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.
@@ -24,22 +24,22 @@
 
 
 /**
- * A configured layout
- * 
+ * A configured layout.
+ *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public class DefaultLayoutDescription
     extends AbstractProducibleDescription
     implements LayoutDescription  {
 
     protected String defaultRendererName;
-    
+
     protected List rendererNames = new ArrayList(2);
-    
+
     protected String itemClassName;
-    
+
     public String getDefaultRendererName() {
         return defaultRendererName;
     }
@@ -61,13 +61,14 @@
     public void addRendererName(String name) {
         this.rendererNames.add( name );
     }
-    
+
     /**
      * @return Returns the itemClassName.
      */
     public String getItemClassName() {
         return this.itemClassName;
     }
+
     /**
      * @param itemClassName The itemClassName to set.
      */

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
+ *
  * Licensed 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.
@@ -119,8 +119,8 @@
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public class DefaultLayoutFactory
 	extends AbstractLogEnabled
@@ -133,18 +133,18 @@
                  Receiver {
 
     protected Map layouts = new HashMap();
-    
+
     protected List descriptions = new ArrayList();
-    
+
     protected ServiceSelector storeSelector;
-    
+
     protected ServiceManager manager;
-    
+
     protected Configuration[] layoutsConf;
 
     protected static long idCounter = System.currentTimeMillis();
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
     public void service(ServiceManager manager) throws ServiceException {
@@ -159,7 +159,7 @@
     throws ConfigurationException {
         DefaultLayoutDescription desc = new DefaultLayoutDescription();
         final String name = layoutConf.getAttribute("name");
-                
+   
         // unique test
         if ( this.layouts.get(name) != null) {
             throw new ConfigurationException("Layout name must be unique. Double definition for " + name);
@@ -172,7 +172,7 @@
         // the renderers
         final String defaultRenderer = layoutConf.getChild("renderers").getAttribute("default");
         desc.setDefaultRendererName(defaultRenderer); 
-                                
+         
         final Configuration[] rendererConfs = layoutConf.getChild("renderers").getChildren("renderer");
         if ( rendererConfs != null ) {
             boolean found = false;
@@ -189,7 +189,7 @@
         } else {
             throw new ConfigurationException("Default renderer '" + defaultRenderer + "' is not configured for layout '" + name + "'");
         }
-        
+
         // and now the aspects
         final Configuration[] aspectsConf = layoutConf.getChild("aspects").getChildren("aspect");
         if (aspectsConf != null) {
@@ -203,7 +203,7 @@
         try {
             service = (PortalService)this.manager.lookup(PortalService.ROLE);
             PortalComponentManager pcManager = service.getComponentManager();
-            
+
             Iterator rendererIterator = desc.getRendererNames();
             while (rendererIterator.hasNext()) {
                 final String rendererName = (String)rendererIterator.next();
@@ -220,14 +220,14 @@
         } finally {
             this.manager.release( service );
         }
-        
+
         // set the aspect data handler
         DefaultAspectDataHandler handler = new DefaultAspectDataHandler(desc, this.storeSelector);
         this.layouts.put(desc.getName(), new Object[] {desc, handler});
         this.descriptions.add(desc);
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
      */
     public void configure(Configuration configuration) 
@@ -253,21 +253,21 @@
             }
         }
     }
-    
-    /* (non-Javadoc)
+
+    /**
      * @see org.apache.cocoon.portal.layout.LayoutFactory#prepareLayout(org.apache.cocoon.portal.layout.Layout)
      */
     public void prepareLayout(Layout layout){
         if ( layout != null ) {
-            
+
             this.init();
-     
+
             final String layoutName = layout.getName();
             if ( layoutName == null ) {
                 throw new LayoutException("Layout '"+layout.getId()+"' has no associated name.");
             }
             Object[] o = (Object[]) this.layouts.get( layoutName );
-            
+
             if ( o == null ) {
                 throw new LayoutException("LayoutDescription with name '" + layoutName + "' not found.");
             }
@@ -280,7 +280,7 @@
             if ( layout instanceof CompositeLayout ) {
                 CompositeLayout composite = (CompositeLayout)layout;
                 composite.setItemClassName(layoutDescription.getItemClassName());
-                
+
                 Iterator items = composite.getItems().iterator();
                 while ( items.hasNext() ) {
                     this.prepareLayout( ((Item)items.next()).getLayout() );
@@ -289,29 +289,28 @@
         }
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.cocoon.portal.layout.LayoutFactory#newInstance(java.lang.String)
      */
     public Layout newInstance(String layoutName) 
     throws ProcessingException {
         this.init();
-        
+
         Object[] o = (Object[]) this.layouts.get( layoutName );
-            
+
         if ( o == null ) {
             throw new ProcessingException("LayoutDescription with name '" + layoutName + "' not found.");
         }
         DefaultLayoutDescription layoutDescription = (DefaultLayoutDescription)o[0];
-        
+
         Layout layout = null;
         try {
             Class clazz = ClassUtils.loadClass( layoutDescription.getClassName() );
             layout = (Layout)clazz.newInstance();
-            
         } catch (Exception e) {
             throw new ProcessingException("Unable to create new instance", e );
         }
-        
+
         String id = null;
         if ( layoutDescription.createId() ) {
             synchronized (this) {
@@ -327,7 +326,7 @@
             CompositeLayout composite = (CompositeLayout)layout;
             composite.setItemClassName(layoutDescription.getItemClassName());
         }
-        
+
         PortalService service = null;
         try {
             service = (PortalService)this.manager.lookup(PortalService.ROLE);
@@ -339,8 +338,8 @@
         }
         return layout;
     }
-    
-    /* (non-Javadoc)
+
+    /**
      * @see org.apache.cocoon.portal.layout.LayoutFactory#getLayoutDescriptions()
      */
     public List getLayoutDescriptions() {
@@ -348,8 +347,7 @@
         return this.descriptions;
     }
 
-
-    /* (non-Javadoc)
+    /**
      * @see org.apache.avalon.framework.activity.Disposable#dispose()
      */
     public void dispose() {
@@ -370,7 +368,7 @@
 
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.avalon.framework.activity.Initializable#initialize()
      */
     public void initialize() throws Exception {
@@ -395,7 +393,7 @@
         }
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.cocoon.portal.layout.LayoutFactory#remove(org.apache.cocoon.portal.layout.Layout)
      */
     public void remove(Layout layout) 
@@ -413,7 +411,7 @@
             if ( parent != null && parent.getParent() != null) {
                 parent.getParent().removeItem( parent );
             }
-            
+
             PortalService service = null;
             EventManager eventManager = null;
             try {

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/FrameLayout.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/FrameLayout.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/FrameLayout.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/FrameLayout.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2005 The Apache Software Foundation.
+ *
  * Licensed 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.
@@ -24,13 +24,13 @@
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public class FrameLayout extends AbstractLayout {
-    
-    private String source;
-    
+
+    protected String source;
+
     /**
      * @return String
      */
@@ -46,15 +46,14 @@
         this.source = source;
     }
 
-    /* (non-Javadoc)
+    /**
      * @see java.lang.Object#clone()
      */
     protected Object clone() throws CloneNotSupportedException {
         FrameLayout clone = (FrameLayout)super.clone();
-        
+
         clone.source = this.source;
-        
+
         return clone;
     }
-    
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/LinkLayout.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/LinkLayout.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/LinkLayout.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/LinkLayout.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
+ *
  * Licensed 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.
@@ -25,8 +25,8 @@
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
  * @author <a href="mailto:juergen.seitz@basf-it-services.com">J&uuml;rgen Seitz</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public class LinkLayout extends AbstractLayout implements Layout {
 
@@ -49,16 +49,15 @@
         linkedLayoutKey = key;
     }
 
-    /* (non-Javadoc)
+    /**
      * @see java.lang.Object#clone()
      */
     protected Object clone() throws CloneNotSupportedException {
         LinkLayout clone = (LinkLayout)super.clone();
-        
+
         clone.linkedLayoutId = this.linkedLayoutId;
         clone.linkedLayoutKey = this.linkedLayoutKey;
-        
+
         return clone;
     }
-    
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/Renderer.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/Renderer.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/Renderer.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/Renderer.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
+ *
  * Licensed 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.
@@ -24,16 +24,16 @@
 
 /**
  * A renderer is responsible for rendering a layout object.
- * 
+ *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public interface Renderer {
-    
+
     String ROLE = Renderer.class.getName();
-    
+
     /**
      * Stream out raw layout 
      */

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspect.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspect.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
  * 
  * Licensed 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.
@@ -28,16 +28,16 @@
  * A renderer aspect extends a renderer with a distinct functionality.
  * It can add a particular decoration like a border or buttons for example.
  * A renderer aspect has to be thread safe!
- * 
+ *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public interface RendererAspect {
-    
+
     String ROLE = RendererAspect.class.getName();
-    
+
     /**
      * Stream out raw layout 
      */

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspectContext.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspectContext.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspectContext.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspectContext.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
  * 
  * Licensed 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.
@@ -29,11 +29,11 @@
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * 
- * @version CVS $Id: RendererAspectContext.java,v 1.5 2004/03/05 13:02:13 bdelacretaz Exp $
+ *
+ * @version $Id$
  */
 public interface RendererAspectContext {
-    
+
     /**
      * Stream out raw layout 
      */
@@ -44,7 +44,7 @@
      * Get the "compiled" configuration of the aspect.
      */
     Object getAspectConfiguration();
-    
+
     /**
      * Set an attribute
      */
@@ -59,7 +59,7 @@
      * Remove an attribute
      */
     void removeAttribute(String key);
-    
+
     /**
      * Get the object model
      */

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractActionAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractActionAspect.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractActionAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractActionAspect.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
+ *
  * Licensed 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.
@@ -22,16 +22,16 @@
 
 /**
  * This aspect creates an event and subscribes to it as well
- * 
+ *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public abstract class AbstractActionAspect
     extends AbstractAspect
     implements Receiver, Disposable, Initializable {
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.avalon.framework.activity.Disposable#dispose()
      */
     public void dispose() {
@@ -50,7 +50,7 @@
         }
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.avalon.framework.activity.Initializable#initialize()
      */
     public void initialize() throws Exception {
@@ -62,5 +62,4 @@
             this.manager.release( eventManager );
         }
     }
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
+ *
  * Licensed 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.
@@ -36,8 +36,8 @@
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public abstract class AbstractAspect
     extends AbstractLogEnabled
@@ -45,14 +45,14 @@
 
     protected ServiceManager manager;
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
     public void service(ServiceManager manager) throws ServiceException {
         this.manager = manager;
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
      */
     public void toSAX(
@@ -72,12 +72,11 @@
         return null;
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#prepareConfiguration(org.apache.avalon.framework.parameters.Parameters)
      */
     public Object prepareConfiguration(Parameters configuration) 
     throws ParameterException {
         return configuration;
     }
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCIncludeAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCIncludeAspect.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCIncludeAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCIncludeAspect.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
+ *
  * Licensed 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.
@@ -23,11 +23,11 @@
 /**
  * Base class for aspect renderers that generate cinclude statements. Provides a single
  * method for creating the cinclude tag.
- * 
+ *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public abstract class AbstractCIncludeAspect 
     extends AbstractAspect {
@@ -53,5 +53,4 @@
         handler.endElement(NAMESPACE, ELEMENT, QELEMENT);
         handler.endPrefixMapping(PREFIX);
     }
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
+ *
  * Licensed 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.
@@ -30,23 +30,22 @@
  * Insert a composite layout's elements into the resulting XML. Elements (items)
  * are processed in order. Concrete descendents of this class need to implement the
  * actual handling of layout elements.
- * 
+ *
  * <h2>Applicable to:</h2>
  * <ul>
  *  <li>{@link org.apache.cocoon.portal.layout.CompositeLayout}</li>
  * </ul>
- * 
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public abstract class AbstractCompositeAspect
     extends AbstractAspect {
 
-	/* (non-Javadoc)
-	 * @see org.apache.cocoon.portal.layout.renderer.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
+	/**
+	 * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
 	 */
 	public void toSAX(RendererAspectContext context,
                 		Layout layout,
@@ -74,7 +73,7 @@
      * @throws SAXException
      */
     protected abstract void processItem(Item item, ContentHandler handler, PortalService service)
-        throws SAXException;
+    throws SAXException;
 
     /**
      * Default implementation for processing a Layout. Calls the associated
@@ -87,5 +86,4 @@
             renderer.toSAX(layout, service, handler);
         }
     }
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CIncludeCopletAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CIncludeCopletAspect.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CIncludeCopletAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CIncludeCopletAspect.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
  * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
- * 
+ *
  * Licensed 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.
@@ -29,7 +29,7 @@
 /**
  * This aspect streams a cinclude statement into the stream that
  * will include the coplet using the coplet protocol.
- * 
+ *
  * <h2>Resulting XML:</h2>
  * <pre>
  * &lt;content&gt;
@@ -40,7 +40,7 @@
  * the CInclude tagname.
  * By default, the cinclude statetement is surrounded by a "content" element;
  * this can be further controlled by parameters (see below).
- * 
+ *
  * <h2>Applicable to:</h2>
  * <ul>
  *  <li>{@link org.apache.cocoon.portal.layout.impl.CopletLayout}</li>
@@ -53,17 +53,17 @@
  *   <tr><th>tag-name</th><td>Name of enclosing tag.</td>
  *      <td></td><td>String</td><td><code>"content"</code></td></tr>
  * </tbody></table>
- * 
+ *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public class CIncludeCopletAspect 
     extends AbstractCIncludeAspect {
 
-    /* (non-Javadoc)
-	 * @see org.apache.cocoon.portal.layout.renderer.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
+	/**
+	 * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
 	 */
 	public void toSAX(RendererAspectContext context,
                 		Layout layout,
@@ -90,14 +90,14 @@
 
         public String tagName;
         public boolean rootTag;
-        
+
         public void takeValues(PreparedConfiguration from) {
             this.tagName = from.tagName;
             this.rootTag = from.rootTag;
         }
     }
-    
-    /* (non-Javadoc)
+
+    /**
      * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#prepareConfiguration(org.apache.avalon.framework.parameters.Parameters)
      */
     public Object prepareConfiguration(Parameters configuration) 
@@ -107,5 +107,4 @@
         pc.rootTag = configuration.getParameterAsBoolean("root-tag", true);
         return pc;
     }
-    
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
+ *
  * Licensed 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.
@@ -31,7 +31,7 @@
 
 /**
  * Add several contents.
- * 
+ *
  * <h2>Example XML:</h2>
  * <pre>
  *  &lt;composite&gt;
@@ -60,23 +60,23 @@
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * 
- * @version CVS $Id: CompositeContentAspect.java,v 1.7 2004/04/25 20:09:34 haul Exp $
+ *
+ * @version $Id$
  */
 public class CompositeContentAspect extends AbstractCompositeAspect {
 
     protected static final String ITEM_STRING = "item";
 
-    /* (non-Javadoc)
-     * @see org.apache.cocoon.portal.layout.renderer.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
+    /**
+     * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
      */
     public void toSAX(RendererAspectContext context,
-                        Layout layout,
-                        PortalService service,
-                        ContentHandler handler)
+                      Layout layout,
+                      PortalService service,
+                      ContentHandler handler)
     throws SAXException {
         PreparedConfiguration config = (PreparedConfiguration)context.getAspectConfiguration();
-        
+
         if ( config.rootTag ) {
             XMLUtils.startElement(handler, config.tagName);
         }
@@ -84,11 +84,10 @@
         if ( config.rootTag ) {
             XMLUtils.endElement(handler, config.tagName);
         }
-
     }
 
-	/* (non-Javadoc)
-	 * @see org.apache.cocoon.portal.layout.renderer.impl.AbstractContentAspect#processItem(org.apache.cocoon.portal.layout.Item, org.xml.sax.ContentHandler, org.apache.cocoon.portal.PortalService)
+	/**
+	 * @see org.apache.cocoon.portal.layout.renderer.aspect.impl.AbstractCompositeAspect#processItem(org.apache.cocoon.portal.layout.Item, org.xml.sax.ContentHandler, org.apache.cocoon.portal.PortalService)
 	 */
 	protected void processItem(Item item,
 		                         ContentHandler handler,
@@ -111,20 +110,19 @@
         }
         processLayout(layout, service, handler);
         XMLUtils.endElement(handler, ITEM_STRING);
-
 	}
 
     protected class PreparedConfiguration {
         public String tagName;
         public boolean rootTag;
-        
+
         public void takeValues(PreparedConfiguration from) {
             this.tagName = from.tagName;
             this.rootTag = from.rootTag;
         }
     }
-    
-    /* (non-Javadoc)
+
+    /**
      * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#prepareConfiguration(org.apache.avalon.framework.parameters.Parameters)
      */
     public Object prepareConfiguration(Parameters configuration) 
@@ -134,5 +132,4 @@
         pc.rootTag = configuration.getParameterAsBoolean("root-tag", true);
         return pc;
     }
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultCopletAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultCopletAspect.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultCopletAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultCopletAspect.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
+ *
  * Licensed 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.
@@ -34,14 +34,14 @@
  * {@link org.apache.cocoon.portal.layout.renderer.aspect.impl.CIncludeCopletAspect}
  * and include the coplet contents later. That would allow caching up to the point 
  * of the cinclude transformer.
- * 
+ *
  * <h2>Example XML:</h2>
  * <pre>
  * &lt;content&gt;
  *   &lt;!-- content streamed from coplet --&gt;
  * &lt;/content&gt;
  * </pre>
- * 
+ *
  * <h2>Applicable to:</h2>
  * <ul>
  *  <li>{@link org.apache.cocoon.portal.layout.impl.CopletLayout}</li>
@@ -49,20 +49,19 @@
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * 
- * @version CVS $Id: DefaultCopletAspect.java,v 1.5 2004/04/25 20:09:34 haul Exp $
+ *
+ * @version $Id$
  */
 public class DefaultCopletAspect extends AbstractAspect {
 
-	/* (non-Javadoc)
-	 * @see org.apache.cocoon.portal.layout.renderer.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
+	/**
+	 * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
 	 */
 	public void toSAX(RendererAspectContext context,
-                		Layout layout,
-                		PortalService service,
-                		ContentHandler handler)
+                      Layout layout,
+                      PortalService service,
+                      ContentHandler handler)
 	throws SAXException {
-        
         XMLUtils.startElement(handler, "content");
         CopletInstanceData cid = ((CopletLayout)layout).getCopletInstanceData();
 
@@ -85,5 +84,4 @@
         XMLUtils.endElement(handler, "content");
         context.invokeNext(layout, service, handler);
 	}
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultRendererContext.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultRendererContext.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultRendererContext.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultRendererContext.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
+ *
  * Licensed 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.
@@ -33,8 +33,8 @@
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * 
- * @version CVS $Id: DefaultRendererContext.java,v 1.6 2004/04/25 20:09:34 haul Exp $
+ *
+ * @version $Id$
  */
 public final class DefaultRendererContext implements RendererAspectContext {
 
@@ -43,36 +43,35 @@
     private Object config;
     private Map attributes;
     private Map objectModel;
-    
+
     public DefaultRendererContext(RendererAspectChain chain) {
         this.iterator = chain.getIterator();
         this.configIterator = chain.getConfigIterator();
     }
-    
-	/* (non-Javadoc)
-	 * @see org.apache.cocoon.portal.layout.renderer.RendererAspectContext#invokeNext(org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
+
+	/**
+	 * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext#invokeNext(org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
 	 */
 	public void invokeNext(Layout layout,
-                    		PortalService service,
-                    		ContentHandler handler)
+                           PortalService service,
+                           ContentHandler handler)
 	throws SAXException {
 		if (iterator.hasNext()) {
             this.config = this.configIterator.next();
             final RendererAspect aspect = (RendererAspect) iterator.next();
             aspect.toSAX(this, layout, service, handler);
 		}
-
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.cocoon.portal.layout.renderer.RendererAspectContext#getConfiguration()
+	/**
+	 * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext#getAspectConfiguration()
 	 */
 	public Object getAspectConfiguration() {
 		return this.config;
 	}
 
     /**
-     * Set an attribute
+     * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext#setAttribute(java.lang.String, java.lang.Object)
      */
     public void setAttribute(String key, Object attribute) {
         if ( key != null ) {
@@ -84,7 +83,7 @@
     }
 
     /**
-     * Get an attribute
+     * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext#getAttribute(java.lang.String)
      */
     public Object getAttribute(String key) {
         if ( key != null && this.attributes != null) {
@@ -94,7 +93,7 @@
     }
 
     /**
-     * Remove an attribute
+     * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext#removeAttribute(java.lang.String)
      */
     public void removeAttribute(String key) {
         if ( this.attributes != null && key != null) {
@@ -102,7 +101,7 @@
         }
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext#getObjectModel()
      */
     public Map getObjectModel() {
@@ -116,5 +115,4 @@
     public void setObjectModel(Map map) {
         this.objectModel = map;
     }
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2005 The Apache Software Foundation.
+ *
  * Licensed 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.
@@ -30,7 +30,7 @@
 
 /**
  * Adds a cinclude tag for a FrameLayout's source to the resulting stream.
- * 
+ *
  * <h2>Example XML:</h2>
  * <pre>
  *  &lt;xy:z src="coplet://copletID"/&gt;
@@ -49,11 +49,14 @@
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public class FrameAspect extends AbstractCIncludeAspect {
 
+    /**
+     * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
+     */
     public void toSAX(RendererAspectContext context, Layout layout, PortalService service, ContentHandler handler)
     throws SAXException {
         PreparedConfiguration config = (PreparedConfiguration)context.getAspectConfiguration();
@@ -66,21 +69,21 @@
         if (source == null) {
             source = ((FrameLayout) layout).getSource();
         }
-        
+
         this.createCInclude(source, handler);
     }
 
     protected static class PreparedConfiguration {
         public String aspectName;
         public String store;
-        
+
         public void takeValues(PreparedConfiguration from) {
             this.aspectName = from.aspectName;
             this.store = from.store;
         }
     }
-    
-    /* (non-Javadoc)
+
+    /**
      * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#prepareConfiguration(org.apache.avalon.framework.parameters.Parameters)
      */
     public Object prepareConfiguration(Parameters configuration) 

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FullScreenCopletAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FullScreenCopletAspect.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FullScreenCopletAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FullScreenCopletAspect.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
+ *
  * Licensed 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.
@@ -32,35 +32,33 @@
  * will be created. Otherwise, it depends on the current layout being the
  * fullscreen layout or not whether the URI contains an event that switches
  * to this layout or not.
- * 
+ *
  * <h2>Example XML:</h2>
  * <pre>
  *   &lt;fullscreen-uri&gt;fullscreen-event-if-supported&lt;/fullscreen-uri&gt;
  *   &lt;!-- output from following renderers --&gt;
  * </pre>
- * 
+ *
  * <h2>Applicable to:</h2>
  * <ul>
  *  <li>{@link org.apache.cocoon.portal.layout.impl.CopletLayout}</li>
  * </ul>
- * 
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public class FullScreenCopletAspect extends AbstractAspect {
 
-	/* (non-Javadoc)
-	 * @see org.apache.cocoon.portal.layout.renderer.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
+	/**
+	 * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
 	 */
 	public void toSAX(RendererAspectContext context,
-                		Layout layout,
-                		PortalService service,
-                		ContentHandler handler)
+                      Layout layout,
+                      PortalService service,
+                      ContentHandler handler)
 	throws SAXException {
-        
         CopletInstanceData cid = ((CopletLayout)layout).getCopletInstanceData();
 
         boolean supportsFullScreen = CopletDataFeatures.supportsFullScreenMode(cid.getCopletData());
@@ -76,5 +74,4 @@
         }
         context.invokeNext(layout, service, handler);
 	}
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/HistoryAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/HistoryAspect.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/HistoryAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/HistoryAspect.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
+ *
  * Licensed 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.
@@ -38,20 +38,20 @@
  * state already present as request attribute. Includes aspect data and parameters
  * as well as aspect data and attributes of a coplet instance if layout is a 
  * coplet layout. This aspect does not add to the XML created by the renderer chain.
- * 
+ *
  * <h2>Example XML</h2>
  * <pre>
  *   &lt;!-- output from following renderers --&gt; 
  * </pre>
- * 
+ *
  * <h2>Applicable to:</h2>
  * <ul>
  *  <li>{@link org.apache.cocoon.portal.layout.Layout}</li>
  * </ul>
- * 
+ *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
- * 
- * @version CVS $Id: HistoryAspect.java,v 1.4 2004/04/25 20:09:34 haul Exp $
+ *
+ * @version $Id$
  */
 public class HistoryAspect 
     extends AbstractAspect {
@@ -75,7 +75,7 @@
         }
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
      */
     public void toSAX(RendererAspectContext context,
@@ -89,7 +89,6 @@
             if ( session != null ) {
                 List history = (List)session.getAttribute("portal-history");
                 if ( history == null ) {
-       
                     history = new ArrayList();
                 }
                 List state = (List)request.getAttribute("portal-history");
@@ -98,10 +97,10 @@
                     request.setAttribute("portal-history", state);
                     history.add(state);
                 }
-                
+
                 this.addValues(layout.getId(), state, layout.getAspectDatas(), "aspectDatas/");
                 this.addValues(layout.getId(), state, layout.getParameters(), "parameters/");
-                
+
                 // are we a coplet layout
                 if ( layout instanceof CopletLayout ) {
                     CopletInstanceData cid = ((CopletLayout)layout).getCopletInstanceData();
@@ -113,5 +112,4 @@
         }
         context.invokeNext(layout, service, handler);
     }
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
+ *
  * Licensed 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.
@@ -33,14 +33,14 @@
  * up later from a stylesheet for example. When passing parameters to the
  * {@link org.apache.cocoon.portal.layout.renderer.aspect.impl.XSLTAspect}
  * consider it's ability to set XSL parameters directly.
- * 
+ *
  * <h2>Example XML:</h2>
  * <pre>
  *   &lt;parameter name1="value1" name2="value2" ... &gt;
  *     &lt;!-- output from following renderers --&gt;
  *   &lt;/parameter&gt;
  * </pre>
- * 
+ *
  * <h2>Applicable to:</h2>
  * <ul>
  *  <li>{@link org.apache.cocoon.portal.layout.Layout}</li>
@@ -51,22 +51,21 @@
  * <tr><th>tag-name</th><td>Name of tag holding key-value pairs as attributes.</td>
  *  <td></td><td>String</td><td><code>"parameter"</code></td></tr>
  * </tbody></table> 
- * 
+ *
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public final class ParameterAspect extends AbstractAspect {
 
-    /* (non-Javadoc)
-     * @see org.apache.cocoon.portal.layout.renderer.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
+    /**
+     * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
      */
     public void toSAX(RendererAspectContext context,
-                        Layout layout,
-                        PortalService service,
-                        ContentHandler contenthandler)
+                      Layout layout,
+                      PortalService service,
+                      ContentHandler contenthandler)
     throws SAXException {
-        
         final PreparedConfiguration config = (PreparedConfiguration)context.getAspectConfiguration();
 
         Map parameter = layout.getParameters();
@@ -89,13 +88,13 @@
 
     protected static class PreparedConfiguration {
         public String tagName;
-        
+
         public void takeValues(PreparedConfiguration from) {
             this.tagName = from.tagName;
         }
     }
-    
-    /* (non-Javadoc)
+
+    /**
      * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#prepareConfiguration(org.apache.avalon.framework.parameters.Parameters)
      */
     public Object prepareConfiguration(Parameters configuration) 

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RemovableAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RemovableAspect.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RemovableAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RemovableAspect.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
+ *
  * Licensed 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.
@@ -29,13 +29,13 @@
 /**
  * Add a tag holding a URI used to remove a coplet from a layout to the
  * output stream if the coplet is not set to mandatory.
- * 
+ *
  * <h2>Example XML:</h2>
  * <pre>
  *   &lt;remove-uri&gt;layout-remove-event&lt;/remove-uri&gt;
  *   &lt;!-- output from following renderers --&gt;
  * </pre>
- * 
+ *
  * <h2>Applicable to:</h2>
  * <ul>
  *  <li>{@link org.apache.cocoon.portal.layout.impl.CopletLayout}</li>
@@ -43,21 +43,20 @@
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public class RemovableAspect 
     extends AbstractAspect {
 
-	/* (non-Javadoc)
-	 * @see org.apache.cocoon.portal.layout.renderer.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
+	/**
+	 * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
 	 */
 	public void toSAX(RendererAspectContext context,
-                		Layout layout,
-                		PortalService service,
-                		ContentHandler handler)
+                      Layout layout,
+                      PortalService service,
+                      ContentHandler handler)
 	throws SAXException {
-        
         CopletInstanceData cid = ((CopletLayout)layout).getCopletInstanceData();
 
         boolean mandatory = CopletDataFeatures.isMandatory(cid.getCopletData());
@@ -67,5 +66,4 @@
         }
         context.invokeNext(layout, service, handler);
 	}
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RendererAspectChain.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RendererAspectChain.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RendererAspectChain.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RendererAspectChain.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
+ *
  * Licensed 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.
@@ -40,20 +40,20 @@
  *      <td>req</td><td>Configuration</td><td><code>null</code></td>
  *  </tr>
  * </tbody></table>
- *  
+ *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * 
- * @version CVS $Id: RendererAspectChain.java,v 1.6 2004/04/25 20:09:34 haul Exp $
+ *
+ * @version $Id$
  */
 public final class RendererAspectChain {
-    
+
     protected List aspects = new ArrayList(3);
-    
+
     protected List configs = new ArrayList(3);
-    
+
     protected List aspectDescriptions = new ArrayList(2);
-    
+
     public void configure(ServiceSelector selector, Configuration conf) 
     throws ConfigurationException {
         if ( conf != null ) {
@@ -68,7 +68,7 @@
                         Parameters aspectConfiguration = Parameters.fromConfiguration(current);
                         Object compiledConf = rAspect.prepareConfiguration(aspectConfiguration);
                         this.configs.add(compiledConf);
-                        
+
                         Iterator descriptionIterator = rAspect.getAspectDescriptions(compiledConf);
                         if ( descriptionIterator != null ) {
                             while ( descriptionIterator.hasNext() ) {
@@ -86,19 +86,19 @@
             throw new ConfigurationException("No aspects configured");
         }
     }
-    
+
     public Iterator getIterator() {
         return this.aspects.iterator();
     }
-    
+
     public Iterator getConfigIterator() {
         return this.configs.iterator();
     }
-    
+
     public Iterator getAspectDescriptionIterator() {
         return this.aspectDescriptions.iterator();
     }
-    
+
     public void dispose(ServiceSelector selector) {
         Iterator i = this.aspects.iterator();
         while (i.hasNext()) {

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/SizingAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/SizingAspect.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/SizingAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/SizingAspect.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
- * 
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
+ *
  * Licensed 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.
@@ -31,30 +31,30 @@
  * This renderer aspect tests, if a coplet is sizable and/or maxpageable and adds
  * tags holding URIs for switching to currently inactive modes (i.e. maximize or
  * minimize).
- * 
+ *
  * <h2>Example XML:</h2>
  * <pre>
  *   &lt;minimize-uri&gt;minimize-event&lt;/minimize-uri&gt;
  *   &lt;!-- output from following renderers --&gt;
- * 
+ *
  * or
- * 
+ *
  *   &lt;maximize-uri&gt;maximize-event&lt;/maximize-uri&gt;
  *   &lt;!-- processing stops here --&gt;
- * 
+ *
  * </pre>
- * 
+ *
  * <h2>Applicable to:</h2>
  * <ul>
  *  <li>{@link org.apache.cocoon.portal.layout.impl.CopletLayout}</li>
  * </ul>
- * 
+ *
  * TODO: make the names of the aspects to test configurable
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public class SizingAspect extends AbstractAspect {
 
@@ -66,14 +66,13 @@
                       PortalService service,
                       ContentHandler handler)
 	throws SAXException {
-        
         CopletInstanceData cid = ((CopletLayout)layout).getCopletInstanceData();
 
         boolean showContent = true;
-        
+
         boolean sizable = CopletDataFeatures.isSizable(cid.getCopletData());
         Integer size = null;
-        
+
         if ( sizable ) {
             size = (Integer)cid.getAspectData("size");
             if ( size == null ) {
@@ -120,5 +119,4 @@
             context.invokeNext(layout, service, handler);
         }
 	}
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java?rev=314978&r1=314977&r2=314978&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java Wed Oct 12 10:49:21 2005
@@ -1,12 +1,12 @@
 /*
  * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
- * 
+ *
  * Licensed 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.
@@ -80,9 +80,8 @@
  *     &lt;/named-item&gt;
  *   &lt;/composite&gt;
  * </pre>
-
  *
- *  *
+ *
  * <h2>Applicable to:</h2>
  * <ul>
  *  <li>{@link org.apache.cocoon.portal.layout.CompositeLayout}</li>
@@ -107,19 +106,19 @@
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public class TabContentAspect 
     extends CompositeContentAspect {
 
-    /* (non-Javadoc)
-     * @see org.apache.cocoon.portal.layout.renderer.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
+    /**
+     * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#toSAX(org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext, org.apache.cocoon.portal.layout.Layout, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler)
      */
     public void toSAX(RendererAspectContext context,
-                        Layout layout,
-                        PortalService service,
-                        ContentHandler handler)
+                      Layout layout,
+                      PortalService service,
+                      ContentHandler handler)
     throws SAXException {
         if (layout instanceof CompositeLayout) {
             TabPreparedConfiguration config = (TabPreparedConfiguration)context.getAspectConfiguration();
@@ -134,7 +133,7 @@
             // selected tab
             Integer data = (Integer) layout.getAspectData(config.aspectName);
             int selected = data.intValue();
-            
+
             // loop over all tabs
             for (int j = 0; j < tabLayout.getSize(); j++) {
                 Item tab = tabLayout.getItem(j);
@@ -157,7 +156,7 @@
                     final Map.Entry entry = (Map.Entry) iter.next();
                     attributes.addCDATAAttribute((String)entry.getKey(), (String)entry.getValue());
                 }
-                
+
                 XMLUtils.startElement(handler, "named-item", attributes);
                 if (j == selected) {
                     this.processLayout(tab.getLayout(), service, handler);
@@ -190,13 +189,13 @@
      */
     public Iterator getAspectDescriptions(Object configuration) {
         TabPreparedConfiguration pc = (TabPreparedConfiguration)configuration;
-        
+
         DefaultAspectDescription desc = new DefaultAspectDescription();
         desc.setName(pc.aspectName);
         desc.setClassName("java.lang.Integer");
         desc.setPersistence(pc.store);
         desc.setAutoCreate(true);
-        
+
         return Collections.singletonList(desc).iterator();
     }
 
@@ -261,8 +260,6 @@
                     // close named-item tag
                     XMLUtils.endElement(handler, "named-item");
                 }
-
-
             }
             // close sub-nav tag
             if (subNav) {
@@ -287,8 +284,8 @@
             this.childTagName = from.childTagName;
         }
     }
-    
-    /* (non-Javadoc)
+
+    /**
      * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#prepareConfiguration(org.apache.avalon.framework.parameters.Parameters)
      */
     public Object prepareConfiguration(Parameters configuration) 
@@ -306,5 +303,4 @@
         pc.includeSelected = configuration.getParameterAsBoolean("include-selected", false);
         return pc;
     }
-
 }



Mime
View raw message