cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r426912 [2/6] - in /cocoon/trunk/blocks/cocoon-portal: cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/ cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/ cocoon-portal-impl/src/main/java/org/apache/c...
Date Sun, 30 Jul 2006 18:41:50 GMT
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/deployment/impl/DefaultDeploymentManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/deployment/impl/DefaultDeploymentManager.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/deployment/impl/DefaultDeploymentManager.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/deployment/impl/DefaultDeploymentManager.java Sun Jul 30 11:41:45 2006
@@ -105,8 +105,8 @@
     /**
      * @see org.apache.cocoon.portal.impl.AbstractComponent#service(org.apache.avalon.framework.service.ServiceManager)
      */
-    public void service(ServiceManager manager) throws ServiceException {
-        super.service(manager);
+    public void service(ServiceManager aManager) throws ServiceException {
+        super.service(aManager);
         this.resolver = (SourceResolver)this.manager.lookup(SourceResolver.ROLE);
     }
 
@@ -225,11 +225,10 @@
             event = new DeploymentEventImpl(deploymentObject);
             this.portalService.getEventManager().send(event);
         } finally {
-            if ( deploymentObject != null ) {
-                try {
-                    deploymentObject.close();
-                } catch (IOException e) {                    
-                }
+            try {
+                deploymentObject.close();
+            } catch (IOException e) {
+                // ignore
             }
         }
         return event;

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/deployment/impl/DefaultDeploymentObject.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/deployment/impl/DefaultDeploymentObject.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/deployment/impl/DefaultDeploymentObject.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/deployment/impl/DefaultDeploymentObject.java Sun Jul 30 11:41:45 2006
@@ -65,10 +65,10 @@
      */
     public InputStream getConfiguration(String configPath)
     throws IOException {
-        ZipFile zipFile = this.getZipFile();
-        ZipEntry entry = zipFile.getEntry(configPath);
+        final ZipFile file = this.getZipFile();
+        final ZipEntry entry = file.getEntry(configPath);
         if (entry != null) {
-            return zipFile.getInputStream(entry);
+            return file.getInputStream(entry);
         }
         return null;
     }

Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/CopletDefinitionEvent.java (from r426594, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/CopletDataEvent.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/CopletDefinitionEvent.java?p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/CopletDefinitionEvent.java&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/CopletDataEvent.java&r1=426594&r2=426912&rev=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/CopletDataEvent.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/CopletDefinitionEvent.java Sun Jul 30 11:41:45 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.cocoon.portal.event;
 
-import org.apache.cocoon.portal.coplet.CopletData;
+import org.apache.cocoon.portal.coplet.CopletDefinition;
 
 
 /**
@@ -24,7 +24,7 @@
  *
  * @version $Id$
  */
-public interface CopletDataEvent extends Event {
+public interface CopletDefinitionEvent extends Event {
 
-    CopletData getTarget();
+    CopletDefinition getTarget();
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/CopletInstanceEvent.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/CopletInstanceEvent.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/CopletInstanceEvent.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/CopletInstanceEvent.java Sun Jul 30 11:41:45 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.cocoon.portal.event;
 
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
 
 
 /**
@@ -25,5 +25,5 @@
  */
 public interface CopletInstanceEvent extends Event {
 
-    CopletInstanceData getTarget();
+    CopletInstance getTarget();
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java Sun Jul 30 11:41:45 2006
@@ -44,8 +44,8 @@
     /**
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
-    public void service(ServiceManager manager) throws ServiceException {
-        this.manager = manager;
+    public void service(ServiceManager aManager) throws ServiceException {
+        this.manager = aManager;
     }
 
     protected abstract String getRequestParameterName();

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java Sun Jul 30 11:41:45 2006
@@ -50,9 +50,9 @@
     /**
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
-    public void service(ServiceManager manager) throws ServiceException {
-        this.manager = manager;
-        this.labelManager = (PageLabelManager)manager.lookup(PageLabelManager.ROLE);
+    public void service(ServiceManager aManager) throws ServiceException {
+        this.manager = aManager;
+        this.labelManager = (PageLabelManager)this.manager.lookup(PageLabelManager.ROLE);
     }
 
     /**

Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/AbstractCopletDefinitionEvent.java (from r426594, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/AbstractCopletDataEvent.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/AbstractCopletDefinitionEvent.java?p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/AbstractCopletDefinitionEvent.java&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/AbstractCopletDataEvent.java&r1=426594&r2=426912&rev=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/AbstractCopletDataEvent.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/AbstractCopletDefinitionEvent.java Sun Jul 30 11:41:45 2006
@@ -15,22 +15,22 @@
  */
 package org.apache.cocoon.portal.event.coplet;
 
-import org.apache.cocoon.portal.coplet.CopletData;
-import org.apache.cocoon.portal.event.CopletDataEvent;
+import org.apache.cocoon.portal.coplet.CopletDefinition;
+import org.apache.cocoon.portal.event.CopletDefinitionEvent;
 
-public class AbstractCopletDataEvent
-    implements CopletDataEvent {
+public class AbstractCopletDefinitionEvent
+    implements CopletDefinitionEvent {
 
-    protected CopletData target;
+    protected CopletDefinition target;
 
-    public AbstractCopletDataEvent(CopletData target) {
+    public AbstractCopletDefinitionEvent(CopletDefinition target) {
         this.target = target;
     }
 
     /**
-     * @see org.apache.cocoon.portal.event.CopletDataEvent#getTarget()
+     * @see org.apache.cocoon.portal.event.CopletDefinitionEvent#getTarget()
      */
-    public CopletData getTarget() {
+    public CopletDefinition getTarget() {
         return this.target;
     }
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/AbstractCopletInstanceEvent.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/AbstractCopletInstanceEvent.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/AbstractCopletInstanceEvent.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/AbstractCopletInstanceEvent.java Sun Jul 30 11:41:45 2006
@@ -15,22 +15,22 @@
  */
 package org.apache.cocoon.portal.event.coplet;
 
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
 import org.apache.cocoon.portal.event.CopletInstanceEvent;
 
 public class AbstractCopletInstanceEvent
     implements CopletInstanceEvent {
 
-    protected CopletInstanceData target;
+    protected CopletInstance target;
 
-    public AbstractCopletInstanceEvent(CopletInstanceData target) {
+    public AbstractCopletInstanceEvent(CopletInstance target) {
         this.target = target;
     }
 
     /**
-     * @see org.apache.cocoon.portal.event.CopletDataEvent#getTarget()
+     * @see org.apache.cocoon.portal.event.CopletDefinitionEvent#getTarget()
      */
-    public CopletInstanceData getTarget() {
+    public CopletInstance getTarget() {
         return this.target;
     }
 }

Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletDefinitionAddedEvent.java (from r426594, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletDataAddedEvent.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletDefinitionAddedEvent.java?p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletDefinitionAddedEvent.java&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletDataAddedEvent.java&r1=426594&r2=426912&rev=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletDataAddedEvent.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletDefinitionAddedEvent.java Sun Jul 30 11:41:45 2006
@@ -15,17 +15,17 @@
  */
 package org.apache.cocoon.portal.event.coplet;
 
-import org.apache.cocoon.portal.coplet.CopletData;
+import org.apache.cocoon.portal.coplet.CopletDefinition;
 
 /**
  * This event is fired when a new coplet is created.
  *
  * @version $Id$
  */
-public class CopletDataAddedEvent
-    extends AbstractCopletDataEvent {
+public class CopletDefinitionAddedEvent
+    extends AbstractCopletDefinitionEvent {
 
-    public CopletDataAddedEvent(CopletData target) {
+    public CopletDefinitionAddedEvent(CopletDefinition target) {
         super(target);
     }    
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletInstanceDataAddedEvent.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletInstanceDataAddedEvent.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletInstanceDataAddedEvent.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletInstanceDataAddedEvent.java Sun Jul 30 11:41:45 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.cocoon.portal.event.coplet;
 
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
 
 /**
  * This event is fired if a new instance is created.
@@ -25,7 +25,7 @@
 public class CopletInstanceDataAddedEvent
     extends AbstractCopletInstanceEvent {
 
-    public CopletInstanceDataAddedEvent(CopletInstanceData target) {
+    public CopletInstanceDataAddedEvent(CopletInstance target) {
         super(target);
     }    
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletInstanceDataRemovedEvent.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletInstanceDataRemovedEvent.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletInstanceDataRemovedEvent.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletInstanceDataRemovedEvent.java Sun Jul 30 11:41:45 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.cocoon.portal.event.coplet;
 
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
 
 /**
  * This event is fired if an instance is removed.
@@ -25,7 +25,7 @@
 public class CopletInstanceDataRemovedEvent
     extends AbstractCopletInstanceEvent {
 
-    public CopletInstanceDataRemovedEvent(CopletInstanceData target) {
+    public CopletInstanceDataRemovedEvent(CopletInstance target) {
         super(target);
     }    
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletInstanceSizingEvent.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletInstanceSizingEvent.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletInstanceSizingEvent.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletInstanceSizingEvent.java Sun Jul 30 11:41:45 2006
@@ -16,8 +16,8 @@
 package org.apache.cocoon.portal.event.coplet;
 
 import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
-import org.apache.cocoon.portal.coplet.CopletInstanceDataFeatures;
+import org.apache.cocoon.portal.coplet.CopletInstance;
+import org.apache.cocoon.portal.coplet.CopletInstanceFeatures;
 import org.apache.cocoon.portal.event.ComparableEvent;
 import org.apache.cocoon.portal.event.ConvertableEvent;
 import org.apache.cocoon.portal.event.CopletInstanceEvent;
@@ -44,10 +44,10 @@
         this.target = service.getProfileManager().getCopletInstanceData(cid);
     }
 
-    public CopletInstanceSizingEvent(CopletInstanceData target, int size) {
+    public CopletInstanceSizingEvent(CopletInstance target, int size) {
         super(target);
-        if ( size < CopletInstanceData.SIZE_MINIMIZED ||
-             size > CopletInstanceData.SIZE_FULLSCREEN ) {
+        if ( size < CopletInstance.SIZE_MINIMIZED ||
+             size > CopletInstance.SIZE_FULLSCREEN ) {
             throw new IllegalArgumentException("Unknown size for coplet: " + size);
         }
         this.size = size;
@@ -62,7 +62,7 @@
      */
     public boolean equalsEvent(ComparableEvent event) {
         if ( event instanceof CopletInstanceEvent
-             && CopletInstanceDataFeatures.isSizingEvent((CopletInstanceEvent)event) ) {
+             && CopletInstanceFeatures.isSizingEvent((CopletInstanceEvent)event) ) {
             if ( this.getTarget().equals( ((CopletInstanceEvent)event).getTarget()) ) {
                 return true;
             }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletJXPathEvent.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletJXPathEvent.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletJXPathEvent.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/coplet/CopletJXPathEvent.java Sun Jul 30 11:41:45 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.cocoon.portal.event.coplet;
 
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
 import org.apache.cocoon.portal.event.CopletInstanceEvent;
 import org.apache.cocoon.portal.event.impl.JXPathEvent;
 
@@ -28,15 +28,15 @@
     extends JXPathEvent
     implements CopletInstanceEvent {
 
-    public CopletJXPathEvent(CopletInstanceData target, String path, Object value) {
+    public CopletJXPathEvent(CopletInstance target, String path, Object value) {
         super( target, path, value );
     }
 
     /**
      * @see org.apache.cocoon.portal.event.CopletInstanceEvent#getTarget()
      */
-    public CopletInstanceData getTarget() {
-        return (CopletInstanceData)this.target;
+    public CopletInstance getTarget() {
+        return (CopletInstance)this.target;
     }
 
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/ChangeCopletsJXPathEvent.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/ChangeCopletsJXPathEvent.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/ChangeCopletsJXPathEvent.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/ChangeCopletsJXPathEvent.java Sun Jul 30 11:41:45 2006
@@ -15,8 +15,8 @@
  */
 package org.apache.cocoon.portal.event.impl;
 
-import org.apache.cocoon.portal.coplet.CopletData;
-import org.apache.cocoon.portal.event.CopletDataEvent;
+import org.apache.cocoon.portal.coplet.CopletDefinition;
+import org.apache.cocoon.portal.event.CopletDefinitionEvent;
 
 /**
  * This event changes the value of all instances of a coplet data.
@@ -24,11 +24,11 @@
  * @version $Id$
  */
 public class ChangeCopletsJXPathEvent
-    implements CopletDataEvent {
+    implements CopletDefinitionEvent {
 
     protected String path;
     protected Object value;
-    protected CopletData target;
+    protected CopletDefinition target;
 
     /**
      * Constructor
@@ -36,7 +36,7 @@
      * @param path   The path for the instance data
      * @param value  The value to set
      */
-    public ChangeCopletsJXPathEvent(CopletData target, String path, Object value) {
+    public ChangeCopletsJXPathEvent(CopletDefinition target, String path, Object value) {
         this.path = path;
         this.value = value;
         this.target = target;
@@ -57,9 +57,9 @@
     }
 
     /**
-     * @see org.apache.cocoon.portal.event.CopletDataEvent#getTarget()
+     * @see org.apache.cocoon.portal.event.CopletDefinitionEvent#getTarget()
      */
-    public CopletData getTarget() {
+    public CopletDefinition getTarget() {
         return this.target;
     }
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/CopletLinkEvent.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/CopletLinkEvent.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/CopletLinkEvent.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/CopletLinkEvent.java Sun Jul 30 11:41:45 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.cocoon.portal.event.impl;
 
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
 import org.apache.cocoon.portal.event.coplet.AbstractCopletInstanceEvent;
 
 /**
@@ -34,7 +34,7 @@
     /**
      * Creates a new LinkEvent.
      */
-    public CopletLinkEvent(CopletInstanceData target, String link) {
+    public CopletLinkEvent(CopletInstance target, String link) {
         super(target);
         this.link = link;
     }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java Sun Jul 30 11:41:45 2006
@@ -130,15 +130,15 @@
             }
             this.configuration = null;
         }
-        DefaultEventAspectContext context = new DefaultEventAspectContext(this.chain);
+        DefaultEventAspectContext eventContext = new DefaultEventAspectContext(this.chain);
         EventConverter converter = null;
         try {
             converter = (EventConverter) this.manager.lookup(EventConverter.ROLE);
 
             // Invoke aspects
-            context.setObjectModel(this.getObjectModel());
-            context.setEventConverter(converter);
-            context.invokeNext( this.portalService );
+            eventContext.setObjectModel(this.getObjectModel());
+            eventContext.setEventConverter(converter);
+            eventContext.invokeNext( this.portalService );
 
         } catch (ServiceException ce) {
             throw new ProcessingException("Unable to lookup component.", ce);

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/EventAspectChain.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/EventAspectChain.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/EventAspectChain.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/EventAspectChain.java Sun Jul 30 11:41:45 2006
@@ -38,10 +38,10 @@
     public void configure(ServiceSelector selector, Configuration conf) 
     throws ConfigurationException {
         if ( conf != null ) {
-            Configuration[] aspects = conf.getChildren("aspect");
-            if ( aspects != null ) {
-                for(int i=0; i < aspects.length; i++) {
-                    final Configuration current = aspects[i];
+            final Configuration[] aspectConfigs = conf.getChildren("aspect");
+            if ( aspectConfigs != null ) {
+                for(int i=0; i < aspectConfigs.length; i++) {
+                    final Configuration current = aspectConfigs[i];
                     final String role = current.getAttribute("type");
                     try {
                         this.aspects.add(selector.select(role));

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/InternalEventReceiver.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/InternalEventReceiver.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/InternalEventReceiver.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/InternalEventReceiver.java Sun Jul 30 11:41:45 2006
@@ -19,10 +19,10 @@
 import java.util.List;
 
 import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletData;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
-import org.apache.cocoon.portal.coplet.CopletInstanceDataFeatures;
-import org.apache.cocoon.portal.event.CopletDataEvent;
+import org.apache.cocoon.portal.coplet.CopletDefinition;
+import org.apache.cocoon.portal.coplet.CopletInstance;
+import org.apache.cocoon.portal.coplet.CopletInstanceFeatures;
+import org.apache.cocoon.portal.event.CopletDefinitionEvent;
 import org.apache.cocoon.portal.event.CopletInstanceEvent;
 import org.apache.cocoon.portal.event.Event;
 import org.apache.cocoon.portal.event.EventManager;
@@ -59,7 +59,7 @@
      * @see Receiver
      */
     public void inform(CopletInstanceEvent event, PortalService service) {
-        CopletInstanceDataFeatures.addChangedCopletInstanceData(service, event.getTarget());
+        CopletInstanceFeatures.addChangedCopletInstanceData(service, event.getTarget());
     }
 
     /**
@@ -68,9 +68,9 @@
     public void inform(JXPathEvent event, PortalService service) {
         final Object target = event.getObject();
         if ( target != null && event.getPath() != null && event.getValue() != null) {
-            if ( target instanceof CopletInstanceData && event.getPath().equals("size") ) {
+            if ( target instanceof CopletInstance && event.getPath().equals("size") ) {
                 int newSize = new Integer(event.getValue().toString()).intValue();
-                CopletInstanceSizingEvent e = new CopletInstanceSizingEvent((CopletInstanceData)target, newSize);
+                CopletInstanceSizingEvent e = new CopletInstanceSizingEvent((CopletInstance)target, newSize);
                 this.inform(e, service);
             } else {
                 final JXPathContext jxpathContext = JXPathContext.newContext(target);
@@ -83,16 +83,16 @@
      * @see Receiver
      */
     public void inform(CopletInstanceSizingEvent event, PortalService service) {
-        final CopletInstanceData cid = event.getTarget();
+        final CopletInstance cid = event.getTarget();
         Layout rootLayout = service.getProfileManager().getPortalLayout(null, null);
         if ( cid != null ) {
             final int oldSize = cid.getSize();
             cid.setSize(event.getSize());
-            if ( event.getSize() == CopletInstanceData.SIZE_FULLSCREEN ) {
-                CopletLayout layout = CopletInstanceDataFeatures.searchLayout(cid.getId(), rootLayout);
+            if ( event.getSize() == CopletInstance.SIZE_FULLSCREEN ) {
+                CopletLayout layout = CopletInstanceFeatures.searchLayout(cid.getId(), rootLayout);
                 LayoutFeatures.setFullScreenInfo(rootLayout, layout);
-            } else if ( event.getSize() == CopletInstanceData.SIZE_MAXIMIZED ) {
-                CopletLayout layout = CopletInstanceDataFeatures.searchLayout(cid.getId(), rootLayout);
+            } else if ( event.getSize() == CopletInstance.SIZE_MAXIMIZED ) {
+                CopletLayout layout = CopletInstanceFeatures.searchLayout(cid.getId(), rootLayout);
                 Item container = LayoutFeatures.searchItemForMaximizedCoplet(layout);
                 if ( container != null ) {
                     final RenderInfo info = new RenderInfo(layout, container);
@@ -102,10 +102,10 @@
                     LayoutFeatures.setFullScreenInfo(rootLayout, layout);                	
                 }
             }
-            if ( oldSize == CopletInstanceData.SIZE_FULLSCREEN ) {
+            if ( oldSize == CopletInstance.SIZE_FULLSCREEN ) {
                 LayoutFeatures.setFullScreenInfo(rootLayout, null);
-            } else if ( oldSize == CopletInstanceData.SIZE_MAXIMIZED ) {
-                CopletLayout layout = CopletInstanceDataFeatures.searchLayout(cid.getId(), rootLayout);
+            } else if ( oldSize == CopletInstance.SIZE_MAXIMIZED ) {
+                CopletLayout layout = CopletInstanceFeatures.searchLayout(cid.getId(), rootLayout);
                 Item container = LayoutFeatures.searchItemForMaximizedCoplet(layout);
                 if ( container != null ) {
                 	LayoutFeatures.setRenderInfo(container.getParent(), null);
@@ -115,7 +115,7 @@
                 }
             }
         } else {
-            if ( event.getSize() == CopletInstanceData.SIZE_FULLSCREEN ) {
+            if ( event.getSize() == CopletInstance.SIZE_FULLSCREEN ) {
                 LayoutFeatures.setFullScreenInfo(rootLayout, null);
             }
         }
@@ -125,14 +125,14 @@
      * @see Receiver
      */
     public void inform(CopletInstanceDataRemovedEvent e, PortalService service) {
-        CopletInstanceData cid = e.getTarget();
+        CopletInstance cid = e.getTarget();
         // full screen?
-        if ( cid.getSize() == CopletInstanceData.SIZE_FULLSCREEN ) {
+        if ( cid.getSize() == CopletInstance.SIZE_FULLSCREEN ) {
             Layout rootLayout = service.getProfileManager().getPortalLayout(null, null);
             LayoutFeatures.setFullScreenInfo(rootLayout, null);
-        } else if ( cid.getSize() == CopletInstanceData.SIZE_MAXIMIZED ) {
+        } else if ( cid.getSize() == CopletInstance.SIZE_MAXIMIZED ) {
             Layout rootLayout = service.getProfileManager().getPortalLayout(null, null);
-            CopletLayout layout = CopletInstanceDataFeatures.searchLayout(cid.getId(), rootLayout);
+            CopletLayout layout = CopletInstanceFeatures.searchLayout(cid.getId(), rootLayout);
             Item container = LayoutFeatures.searchItemForMaximizedCoplet(layout);
             if ( container != null ) {
                 LayoutFeatures.setRenderInfo(container.getParent(), null);
@@ -143,8 +143,8 @@
     /**
      * @see Receiver
      */
-    public void inform(CopletDataEvent e, PortalService service) {
-        CopletData data = e.getTarget();
+    public void inform(CopletDefinitionEvent e, PortalService service) {
+        CopletDefinition data = e.getTarget();
         List instances = null;
 
         ProfileManager profileManager = service.getProfileManager();
@@ -157,7 +157,7 @@
   
             Iterator i = instances.iterator();
             while ( i.hasNext() ) {
-                CopletInstanceData current = (CopletInstanceData) i.next();
+                CopletInstance current = (CopletInstance) i.next();
                 Event event = new CopletJXPathEvent(current, path, value);
                 eventManager.send(event);
             }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/PageLabelEventConverter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/PageLabelEventConverter.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/PageLabelEventConverter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/PageLabelEventConverter.java Sun Jul 30 11:41:45 2006
@@ -46,9 +46,9 @@
     /**
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
-    public void service(ServiceManager manager) throws ServiceException {
-        this.manager = manager;
-        this.labelManager = (PageLabelManager)manager.lookup(PageLabelManager.ROLE);
+    public void service(ServiceManager aManager) throws ServiceException {
+        this.manager = aManager;
+        this.labelManager = (PageLabelManager)this.manager.lookup(PageLabelManager.ROLE);
     }
 
     /**

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/layout/LayoutRemoveEvent.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/layout/LayoutRemoveEvent.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/layout/LayoutRemoveEvent.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/layout/LayoutRemoveEvent.java Sun Jul 30 11:41:45 2006
@@ -16,7 +16,7 @@
 package org.apache.cocoon.portal.event.layout;
 
 import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstanceDataFeatures;
+import org.apache.cocoon.portal.coplet.CopletInstanceFeatures;
 import org.apache.cocoon.portal.event.ConvertableEvent;
 import org.apache.cocoon.portal.layout.Layout;
 import org.apache.cocoon.portal.layout.impl.CopletLayout;
@@ -44,7 +44,7 @@
             this.target = service.getProfileManager().getPortalLayout(null, eventData.substring(1));
         } else if ( eventData.charAt(0) == 'C' ) {
             final Layout rootLayout = service.getProfileManager().getPortalLayout(null, null);
-            this.target = CopletInstanceDataFeatures.searchLayout(eventData.substring(1), rootLayout);            
+            this.target = CopletInstanceFeatures.searchLayout(eventData.substring(1), rootLayout);            
         }
     }
 

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/generation/AbstractCopletGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/generation/AbstractCopletGenerator.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/generation/AbstractCopletGenerator.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/generation/AbstractCopletGenerator.java Sun Jul 30 11:41:45 2006
@@ -24,7 +24,7 @@
 import org.apache.cocoon.generation.ServiceableGenerator;
 import org.apache.cocoon.portal.Constants;
 import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
 import org.xml.sax.SAXException;
 
 /**
@@ -64,9 +64,9 @@
      * @return The coplet instance data
      * @throws SAXException If an errors occurs or the instance data is not available
      */
-    protected CopletInstanceData getCopletInstanceData() 
+    protected CopletInstance getCopletInstanceData() 
     throws SAXException {
-        CopletInstanceData cid = this.getCopletInstanceData(null);
+        CopletInstance cid = this.getCopletInstanceData(null);
         if ( cid == null ) {
             throw new SAXException("Could not find coplet instance data for the current pipeline.");
         }
@@ -87,12 +87,12 @@
      * @return The coplet instance data or null
      * @throws SAXException If an error occurs
      */
-    protected CopletInstanceData getCopletInstanceData(String copletId) 
+    protected CopletInstance getCopletInstanceData(String instanceId) 
     throws SAXException {
-        final Map context = (Map)objectModel.get(ObjectModelHelper.PARENT_CONTEXT);
-
+        String copletId = instanceId;
         if ( copletId == null ) {
             // determine coplet id
+            final Map context = (Map)objectModel.get(ObjectModelHelper.PARENT_CONTEXT);
             if (context != null) {
                 copletId = (String)context.get(Constants.COPLET_ID_KEY);
             } else {
@@ -110,7 +110,7 @@
             throw new SAXException("copletId must be passed as parameter or in the object model within the parent context.");
         }
 
-        CopletInstanceData object = this.getPortalService().getProfileManager().getCopletInstanceData( copletId );
+        CopletInstance object = this.getPortalService().getProfileManager().getCopletInstanceData( copletId );
 
         return object;
     }
@@ -129,8 +129,8 @@
     /**
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
-    public void service(ServiceManager manager) throws ServiceException {
-        super.service(manager);
+    public void service(ServiceManager aManager) throws ServiceException {
+        super.service(aManager);
         this.portalService = (PortalService)this.manager.lookup(PortalService.ROLE);
     }
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/generation/PortalGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/generation/PortalGenerator.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/generation/PortalGenerator.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/generation/PortalGenerator.java Sun Jul 30 11:41:45 2006
@@ -58,8 +58,8 @@
     /**
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
-    public void service(ServiceManager manager) throws ServiceException {
-        super.service(manager);
+    public void service(ServiceManager aManager) throws ServiceException {
+        super.service(aManager);
         this.portalService = (PortalService)this.manager.lookup(PortalService.ROLE);
     }
 

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/AbstractComponent.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/AbstractComponent.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/AbstractComponent.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/AbstractComponent.java Sun Jul 30 11:41:45 2006
@@ -51,15 +51,15 @@
     /**
      * @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
      */
-    public void contextualize(Context context) throws ContextException {
-        this.context = context;
+    public void contextualize(Context aContext) throws ContextException {
+        this.context = aContext;
     }
 
     /**
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
-    public void service(ServiceManager manager) throws ServiceException {
-        this.manager = manager;
+    public void service(ServiceManager aManager) throws ServiceException {
+        this.manager = aManager;
         this.portalService = (PortalService) this.manager.lookup(PortalService.ROLE);
     }
     /**

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultLinkService.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultLinkService.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultLinkService.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultLinkService.java Sun Jul 30 11:41:45 2006
@@ -78,8 +78,8 @@
     /**
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
-    public void service(ServiceManager manager) throws ServiceException {
-        this.manager = manager;
+    public void service(ServiceManager aManager) throws ServiceException {
+        this.manager = aManager;
         this.converter = (EventConverter)this.manager.lookup(EventConverter.ROLE);
     }
 
@@ -358,8 +358,8 @@
     /**
      * @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
      */
-    public void contextualize(Context context) throws ContextException {
-        this.context = context;
+    public void contextualize(Context aContext) throws ContextException {
+        this.context = aContext;
     }
 
     /**
@@ -391,8 +391,8 @@
         public ConstantParameterMatcher(String value) {
             this.name = value;
         }
-        public boolean match(String name) {
-            return this.name.equals(name);
+        public boolean match(String matchingName) {
+            return this.name.equals(matchingName);
         }
     }
     public static final class PrefixParameterMatcher implements ParameterMatcher {

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/LinkInfo.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/LinkInfo.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/LinkInfo.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/LinkInfo.java Sun Jul 30 11:41:45 2006
@@ -22,7 +22,6 @@
 import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.environment.wrapper.RequestParameters;
 import org.apache.cocoon.util.NetUtils;
-import org.apache.commons.lang.BooleanUtils;
 
 /**
  * Helper class containing the information about common parts for each link
@@ -87,10 +86,7 @@
 
     public String getBase(Boolean secure) {
         // if no information is provided, we stay with the same protocol
-        if ( secure == null ) {
-            secure = BooleanUtils.toBooleanObject(this.isSecure);
-        }
-        if ( secure.booleanValue() ) {
+        if ( (secure == null && this.isSecure ) || (secure != null && secure.booleanValue() )) {
             return this.secureLinkBase + this.url.toString();
         }
         return this.httpLinkBase + this.url.toString();

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java Sun Jul 30 11:41:45 2006
@@ -44,8 +44,8 @@
     /**
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
-    public void service(ServiceManager manager) throws ServiceException {
-        super.service(manager);
+    public void service(ServiceManager aManager) throws ServiceException {
+        super.service(aManager);
         this.labelManager = (PageLabelManager)this.manager.lookup(PageLabelManager.ROLE);
     }
 

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PageLabelManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PageLabelManager.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PageLabelManager.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PageLabelManager.java Sun Jul 30 11:41:45 2006
@@ -75,8 +75,8 @@
     /**
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
-    public void service(ServiceManager manager) throws ServiceException {
-        this.manager = manager;
+    public void service(ServiceManager aManager) throws ServiceException {
+        this.manager = aManager;
     }
 
     /**
@@ -93,8 +93,8 @@
     /**
      * @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
      */
-    public void contextualize(Context context) throws ContextException {
-        this.context = context;
+    public void contextualize(Context aContext) throws ContextException {
+        this.context = aContext;
     }
 
     /**

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerAspectChain.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerAspectChain.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerAspectChain.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerAspectChain.java Sun Jul 30 11:41:45 2006
@@ -45,9 +45,9 @@
                           Parameters          endAspectParameters) 
     throws ConfigurationException {
         if ( conf != null ) {
-            Configuration[] aspects = conf.getChildren("aspect");
-            for(int i=0; i < aspects.length; i++) {
-                final Configuration current = aspects[i];
+            final Configuration[] aspectConfigs = conf.getChildren("aspect");
+            for(int i=0; i < aspectConfigs.length; i++) {
+                final Configuration current = aspectConfigs[i];
                 final String role = current.getAttribute("type", null);
                 PortalManagerAspect pAspect;
                 if ( role != null ) {

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java Sun Jul 30 11:41:45 2006
@@ -37,8 +37,8 @@
 import org.apache.cocoon.portal.PortalManagerAspectPrepareContext;
 import org.apache.cocoon.portal.PortalManagerAspectRenderContext;
 import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
-import org.apache.cocoon.portal.coplet.CopletInstanceDataFeatures;
+import org.apache.cocoon.portal.coplet.CopletInstance;
+import org.apache.cocoon.portal.coplet.CopletInstanceFeatures;
 import org.apache.cocoon.portal.coplet.adapter.CopletAdapter;
 import org.apache.cocoon.portal.event.EventManager;
 import org.apache.cocoon.portal.layout.Layout;
@@ -131,14 +131,14 @@
     /**
      * @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
      */
-    public void contextualize(Context context) throws ContextException {
-        this.context = context;
+    public void contextualize(Context aContext) throws ContextException {
+        this.context = aContext;
     }
 
     /**
      * @see org.apache.cocoon.portal.PortalManagerAspect#prepare(org.apache.cocoon.portal.PortalManagerAspectPrepareContext, org.apache.cocoon.portal.PortalService)
      */
-    public void prepare(PortalManagerAspectPrepareContext context, PortalService service) throws ProcessingException {
+    public void prepare(PortalManagerAspectPrepareContext renderContext, PortalService service) throws ProcessingException {
         EventManager eventManager = this.portalService.getEventManager();
         eventManager.processEvents();
     }
@@ -146,7 +146,7 @@
     /**
      * @see org.apache.cocoon.portal.PortalManagerAspect#render(org.apache.cocoon.portal.PortalManagerAspectRenderContext, org.apache.cocoon.portal.PortalService, org.xml.sax.ContentHandler, org.apache.avalon.framework.parameters.Parameters)
      */
-    public void render(PortalManagerAspectRenderContext context,
+    public void render(PortalManagerAspectRenderContext renderContext,
                        PortalService                    service,
                        ContentHandler                   ch,
                        Parameters                       parameters)
@@ -154,19 +154,19 @@
         final ProfileManager profileManager = this.portalService.getProfileManager();
 
         // test for ajax request
-        final Request req = ObjectModelHelper.getRequest(context.getObjectModel());
+        final Request req = ObjectModelHelper.getRequest(renderContext.getObjectModel());
         if ( AjaxHelper.isAjaxRequest(req) ) {
             Layout rootLayout = profileManager.getPortalLayout(null, null);
             ch.startDocument();
             XMLUtils.startElement(ch, "coplets");
-            final List changed = CopletInstanceDataFeatures.getChangedCopletInstanceDataObjects(service);
+            final List changed = CopletInstanceFeatures.getChangedCopletInstanceDataObjects(service);
             final Iterator i = changed.iterator();
             while ( i.hasNext() ) {
-                final CopletInstanceData current = (CopletInstanceData)i.next();
+                final CopletInstance current = (CopletInstance)i.next();
                 AttributesImpl a = new AttributesImpl();
                 a.addCDATAAttribute("id", current.getId());
                 XMLUtils.startElement(ch, "coplet", a);
-                final Layout l = CopletInstanceDataFeatures.searchLayout(current.getId(), rootLayout);
+                final Layout l = CopletInstanceFeatures.searchLayout(current.getId(), rootLayout);
                 Renderer portalLayoutRenderer = this.portalService.getRenderer( l.getRendererName());
                 portalLayoutRenderer.toSAX(l, this.portalService, ch);
                 XMLUtils.endElement(ch, "coplet");
@@ -183,9 +183,9 @@
                 throw new SAXException("Only one of the paramteters can be specified for rendering: coplet or layout.");
             }
             if ( StringUtils.isNotEmpty(copletId) ) {
-                final CopletInstanceData cid = profileManager.getCopletInstanceData(copletId);
+                final CopletInstance cid = profileManager.getCopletInstanceData(copletId);
                 if ( cid != null ) {
-                    portalLayout = CopletInstanceDataFeatures.searchLayout(cid.getId(), profileManager.getPortalLayout(null, null));
+                    portalLayout = CopletInstanceFeatures.searchLayout(cid.getId(), profileManager.getPortalLayout(null, null));
                 }
             } else if ( StringUtils.isNotEmpty(layoutId) ) {
                 portalLayout = profileManager.getPortalLayout(null, layoutId);
@@ -210,6 +210,6 @@
         }
         // although we should be the last in the queue,
         // let's invoke the next
-        context.invokeNext(ch, parameters);
+        renderContext.invokeNext(ch, parameters);
     }
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java Sun Jul 30 11:41:45 2006
@@ -93,7 +93,7 @@
     final protected static String KEY = PortalServiceImpl.class.getName();
 
     /** The portal configuration. */
-    protected Configuration config;
+    protected Configuration configuration;
 
     /**
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
@@ -296,7 +296,7 @@
         } finally {
             this.manager.release(resolver);
         }
-        this.config = portal.getChild("configuration");
+        this.configuration = portal.getChild("configuration");
     }
 
     /**
@@ -340,7 +340,7 @@
      * @see org.apache.cocoon.portal.PortalService#getConfiguration(java.lang.String, java.lang.String)
      */
     public String getConfiguration(String key, String defaultValue) {
-        return this.config.getChild(key).getValue(defaultValue);
+        return this.configuration.getChild(key).getValue(defaultValue);
     }
 
     /**
@@ -354,7 +354,7 @@
      * @see org.apache.cocoon.portal.PortalService#getConfigurationAsBoolean(java.lang.String, boolean)
      */
     public boolean getConfigurationAsBoolean(String key, boolean defaultValue) {
-        return this.config.getChild(key).getValueAsBoolean(defaultValue);
+        return this.configuration.getChild(key).getValueAsBoolean(defaultValue);
     }
 
     /**

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PreloadPortalManagerAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PreloadPortalManagerAspect.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PreloadPortalManagerAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PreloadPortalManagerAspect.java Sun Jul 30 11:41:45 2006
@@ -25,8 +25,8 @@
 import org.apache.cocoon.portal.PortalManagerAspectPrepareContext;
 import org.apache.cocoon.portal.PortalManagerAspectRenderContext;
 import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
-import org.apache.cocoon.portal.coplet.CopletInstanceDataFeatures;
+import org.apache.cocoon.portal.coplet.CopletInstance;
+import org.apache.cocoon.portal.coplet.CopletInstanceFeatures;
 import org.apache.cocoon.portal.coplet.adapter.CopletAdapter;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
@@ -66,11 +66,11 @@
     throws SAXException {
         // we should be the first aspect for rendering
         // preload all changed coplets
-        final List changedCoplets = CopletInstanceDataFeatures.getChangedCopletInstanceDataObjects(service);
+        final List changedCoplets = CopletInstanceFeatures.getChangedCopletInstanceDataObjects(service);
         final Iterator i = changedCoplets.iterator();
         while (i.hasNext()) {
-            final CopletInstanceData cid = (CopletInstanceData)i.next();
-            final String adapterName = cid.getCopletData().getCopletBaseData().getCopletAdapterName();
+            final CopletInstance cid = (CopletInstance)i.next();
+            final String adapterName = cid.getCopletDefinition().getCopletType().getCopletAdapterName();
             final CopletAdapter adapter = service.getCopletAdapter(adapterName);
             adapter.toSAX(cid, nullHandler );
         }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/Layout.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/Layout.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/Layout.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/Layout.java Sun Jul 30 11:41:45 2006
@@ -15,6 +15,8 @@
  */
 package org.apache.cocoon.portal.layout;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
 
 import org.apache.cocoon.portal.PortalRuntimeException;
@@ -50,10 +52,10 @@
     protected Item parent;
 
     /** The name of the layout. */
-    protected String name;
+    protected final String name;
 
     /** The unique identifier of this layout object or null. */
-    protected String id;
+    protected final String id;
 
     /** The corresponding layout descripton. */
     transient protected LayoutDescription description;
@@ -225,17 +227,33 @@
      * @see java.lang.Object#clone()
      */
     protected Object clone() throws CloneNotSupportedException {
-        Layout clone = (Layout)super.clone();
-
-        // we don't clone the parent; we just set it to null
-        clone.name = this.name;
-        clone.id = this.id;
-        clone.description = this.description;
-        clone.rendererName = this.rendererName;
-        clone.isStatic = this.isStatic;
-        clone.temporaryAttributes = new LinkedMap(this.temporaryAttributes);
-        clone.parent = null;
+        
+        Constructor c;
+        try {
+            c = this.getClass().getConstructor(new Class[] {String.class, String.class});
+            final Layout clone = (Layout)c.newInstance(new Object[] {this.id, this.name}); 
 
-        return clone;
+            // clone fields from AbstractParameters
+            clone.parameters = new LinkedMap(this.parameters);
+            
+            // we don't clone the parent; we just set it to null
+            clone.parent = null;
+            clone.description = this.description;
+            clone.rendererName = this.rendererName;
+            clone.isStatic = this.isStatic;
+            clone.temporaryAttributes = new LinkedMap(this.temporaryAttributes);
+
+            return clone;
+        } catch (NoSuchMethodException e) {
+            throw new CloneNotSupportedException("Unable to find constructor for new layout object.");
+        } catch (InstantiationException e) {
+            throw new CloneNotSupportedException("Unable to create layout object.");
+        } catch (InvocationTargetException e) {
+            throw new CloneNotSupportedException("Unable to invoke constructor for new layout object.");
+        } catch (IllegalArgumentException e) {
+            throw new CloneNotSupportedException("Unable to invoke constructor for new layout object.");
+        } catch (IllegalAccessException e) {
+            throw new CloneNotSupportedException("Unable to invoke constructor for new layout object.");
+        }
     }
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java Sun Jul 30 11:41:45 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.cocoon.portal.layout.impl;
 
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
 import org.apache.cocoon.portal.layout.Layout;
 import org.apache.cocoon.portal.layout.LayoutFactory;
 
@@ -27,7 +27,7 @@
 public final class CopletLayout extends Layout {
 
     /** The coplet instance data. */
-    protected CopletInstanceData copletInstanceData;
+    protected CopletInstance copletInstanceData;
 
     /**
      * Create a new coplet layout object.
@@ -40,11 +40,11 @@
         super(id, name);
     }
 
-    public void setCopletInstanceData(CopletInstanceData cid) {
+    public void setCopletInstanceData(CopletInstance cid) {
         this.copletInstanceData = cid;
     }
 
-    public CopletInstanceData getCopletInstanceData() {
+    public CopletInstance getCopletInstanceData() {
         return this.copletInstanceData;
     }
 

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutDescription.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutDescription.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutDescription.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutDescription.java Sun Jul 30 11:41:45 2006
@@ -62,8 +62,8 @@
         return this.rendererNames.iterator();
     }
 
-    public void addRendererName(String name) {
-        this.rendererNames.add( name );
+    public void addRendererName(String rendererName) {
+        this.rendererNames.add( rendererName );
     }
 
     /**

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java Sun Jul 30 11:41:45 2006
@@ -234,9 +234,10 @@
             throw new LayoutException("LayoutDescription with name '" + layoutName + "' not found.");
         }
 
-        if ( layoutDescription.createId() && id == null ) {
+        String layoutId = id;
+        if ( layoutDescription.createId() && layoutId == null ) {
             synchronized (this) {
-                id = layoutName + '_' + idCounter;
+                layoutId = layoutName + '_' + idCounter;
                 idCounter += 1;
             }
         }
@@ -244,7 +245,7 @@
         try {
             Class clazz = ClassUtils.loadClass( layoutDescription.getClassName() );
             Constructor constructor = clazz.getConstructor(new Class[] {String.class, String.class});
-            layout = (Layout)constructor.newInstance(new Object[] {id, layoutName});
+            layout = (Layout)constructor.newInstance(new Object[] {layoutId, layoutName});
         } catch (Exception e) {
             throw new LayoutException("Unable to create new layout instance for: " + layoutDescription , e );
         }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.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/AbstractCompositeAspect.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java Sun Jul 30 11:41:45 2006
@@ -46,7 +46,7 @@
 	/**
 	 * @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,
+	public void toSAX(RendererAspectContext rendererContext,
                 	  Layout                layout,
                 	  PortalService         service,
                 	  ContentHandler        handler)
@@ -60,16 +60,16 @@
 	            for (Iterator iter = compositeLayout.getItems().iterator(); iter.hasNext();) {
 	                Item item = (Item) iter.next();
 	                if ( item.equals(maximizedInfo.item) ) {
-	                    this.processMaximizedItem(context, item, maximizedInfo.layout, handler, service);
+	                    this.processMaximizedItem(rendererContext, item, maximizedInfo.layout, handler, service);
 	                } else if ( item.getLayout().isStatic().booleanValue() ) {
-	                    this.processItem(context, item, handler, service);	                	
+	                    this.processItem(rendererContext, item, handler, service);	                	
 	                }
 	            }            	
             } else {
 	        	// loop over all rows
 	            for (Iterator iter = compositeLayout.getItems().iterator(); iter.hasNext();) {
 	                Item item = (Item) iter.next();
-	                this.processItem(context, item, handler, service);
+	                this.processItem(rendererContext, item, handler, service);
 	            }
             }
         } else {
@@ -85,7 +85,7 @@
      * @param service portal service providing component access
      * @throws SAXException
      */
-    protected abstract void processItem(RendererAspectContext context,
+    protected abstract void processItem(RendererAspectContext rendererContext,
                                         Item                  item,
                                         ContentHandler        handler,
                                         PortalService         service)
@@ -100,7 +100,7 @@
      * @param service portal service providing component access
      * @throws SAXException
      */
-    protected abstract void processMaximizedItem(RendererAspectContext context, Item item, Layout maximizedLayout, ContentHandler handler, PortalService service)
+    protected abstract void processMaximizedItem(RendererAspectContext rendererContext, Item item, Layout maximizedLayout, ContentHandler handler, PortalService service)
     throws SAXException;
 
     /**

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CIncludeCopletAspect.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/CIncludeCopletAspect.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CIncludeCopletAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CIncludeCopletAspect.java Sun Jul 30 11:41:45 2006
@@ -18,7 +18,7 @@
 import org.apache.avalon.framework.parameters.ParameterException;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
 import org.apache.cocoon.portal.layout.Layout;
 import org.apache.cocoon.portal.layout.impl.CopletLayout;
 import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext;
@@ -62,13 +62,13 @@
 	/**
 	 * @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,
+	public void toSAX(RendererAspectContext rendererContext,
                 		Layout layout,
                 		PortalService service,
                 		ContentHandler handler)
 	throws SAXException {
-        final PreparedConfiguration config = (PreparedConfiguration)context.getAspectConfiguration();
-        final CopletInstanceData cid = ((CopletLayout)layout).getCopletInstanceData();
+        final PreparedConfiguration config = (PreparedConfiguration)rendererContext.getAspectConfiguration();
+        final CopletInstance cid = ((CopletLayout)layout).getCopletInstanceData();
 
         if ( config.rootTag ) {
             XMLUtils.startElement(handler, config.tagName);
@@ -80,7 +80,7 @@
             XMLUtils.endElement(handler, config.tagName);
         }
 
-        context.invokeNext(layout, service, handler);
+        rendererContext.invokeNext(layout, service, handler);
 	}
 
     protected static class PreparedConfiguration {

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.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/CompositeContentAspect.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.java Sun Jul 30 11:41:45 2006
@@ -71,12 +71,12 @@
     /**
      * @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,
+    public void toSAX(RendererAspectContext rendererContext,
                       Layout                layout,
                       PortalService         service,
                       ContentHandler        handler)
     throws SAXException {
-        PreparedConfiguration config = (PreparedConfiguration)context.getAspectConfiguration();
+        PreparedConfiguration config = (PreparedConfiguration)rendererContext.getAspectConfiguration();
         if ( config.rootTag) {
             final AttributesImpl ai = new AttributesImpl();
             if ( config.rootTagClass != null ) {
@@ -87,7 +87,7 @@
             }
             XMLUtils.startElement(handler, config.tagName, ai);
         }
-        super.toSAX(context, layout, service, handler);
+        super.toSAX(rendererContext, layout, service, handler);
         if ( config.rootTag ) {
             XMLUtils.endElement(handler, config.tagName);
         }
@@ -96,12 +96,12 @@
 	/**
 	 * @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(RendererAspectContext context,
+	protected void processItem(RendererAspectContext rendererContext,
                                Item                  item,
 		                       ContentHandler        handler,
 		                       PortalService         service)
     throws SAXException {
-        final PreparedConfiguration config = (PreparedConfiguration)context.getAspectConfiguration();
+        final PreparedConfiguration config = (PreparedConfiguration)rendererContext.getAspectConfiguration();
         Layout layout = item.getLayout();
 
         if ( config.itemTag ) {
@@ -128,13 +128,13 @@
 	/**
 	 * @see org.apache.cocoon.portal.layout.renderer.aspect.impl.AbstractCompositeAspect#processMaximizedItem(org.apache.cocoon.portal.layout.Item, org.apache.cocoon.portal.layout.Layout, org.xml.sax.ContentHandler, org.apache.cocoon.portal.PortalService)
 	 */
-	protected void processMaximizedItem(RendererAspectContext context,
+	protected void processMaximizedItem(RendererAspectContext rendererContext,
                                         Item                  item,
                                         Layout                maximizedLayout,
                                         ContentHandler        handler,
                                         PortalService         service)
     throws SAXException {
-        final PreparedConfiguration config = (PreparedConfiguration)context.getAspectConfiguration();
+        final PreparedConfiguration config = (PreparedConfiguration)rendererContext.getAspectConfiguration();
         Map parameters = item.getParameters();
         if ( config.itemTag ) {
             if (parameters.size() == 0) {

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultCopletAspect.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/DefaultCopletAspect.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultCopletAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultCopletAspect.java Sun Jul 30 11:41:45 2006
@@ -18,7 +18,7 @@
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceSelector;
 import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
 import org.apache.cocoon.portal.coplet.adapter.CopletAdapter;
 import org.apache.cocoon.portal.layout.Layout;
 import org.apache.cocoon.portal.layout.impl.CopletLayout;
@@ -54,15 +54,15 @@
 	/**
 	 * @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,
+	public void toSAX(RendererAspectContext rendererContext,
                       Layout layout,
                       PortalService service,
                       ContentHandler handler)
 	throws SAXException {
         XMLUtils.startElement(handler, "content");
-        CopletInstanceData cid = ((CopletLayout)layout).getCopletInstanceData();
+        CopletInstance cid = ((CopletLayout)layout).getCopletInstanceData();
 
-        final String adapterName = cid.getCopletData().getCopletBaseData().getCopletAdapterName();
+        final String adapterName = cid.getCopletDefinition().getCopletType().getCopletAdapterName();
         CopletAdapter copletAdapter = null;
         ServiceSelector adapterSelector = null;
         try {
@@ -72,13 +72,13 @@
         } catch (ServiceException ce) {
             throw new SAXException("Unable to lookup component.", ce);
         } finally {
-            if (null != copletAdapter) {
+            if (null != adapterSelector) {
                 adapterSelector.release(copletAdapter);
             }
             this.manager.release(adapterSelector);
         }
 
         XMLUtils.endElement(handler, "content");
-        context.invokeNext(layout, service, handler);
+        rendererContext.invokeNext(layout, service, handler);
 	}
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.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/FrameAspect.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java Sun Jul 30 11:41:45 2006
@@ -42,7 +42,7 @@
     /**
      * @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)
+    public void toSAX(RendererAspectContext rendererContext, Layout layout, PortalService service, ContentHandler handler)
     throws SAXException {
         if (!(layout instanceof FrameLayout)) {
             throw new SAXException("Wrong layout type, FrameLayout expected: " + layout.getClass().getName());

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/HistoryAspect.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/HistoryAspect.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/HistoryAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/HistoryAspect.java Sun Jul 30 11:41:45 2006
@@ -26,7 +26,7 @@
 import org.apache.cocoon.portal.PortalService;
 import org.apache.cocoon.portal.acting.helpers.CopletEventDescription;
 import org.apache.cocoon.portal.acting.helpers.LayoutEventDescription;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
 import org.apache.cocoon.portal.layout.Layout;
 import org.apache.cocoon.portal.layout.impl.CopletLayout;
 import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext;
@@ -86,13 +86,13 @@
     /**
      * @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,
+    public void toSAX(RendererAspectContext rendererContext,
                     Layout layout,
                     PortalService service,
                     ContentHandler handler)
     throws SAXException {
         if ( layout.getId() != null ) {
-            final Request request = ObjectModelHelper.getRequest(context.getObjectModel());
+            final Request request = ObjectModelHelper.getRequest(rendererContext.getObjectModel());
             final Session session = request.getSession(false);
             if ( session != null ) {
                 List history = (List)session.getAttribute("portal-history");
@@ -111,13 +111,13 @@
 
                 // are we a coplet layout
                 if ( layout instanceof CopletLayout ) {
-                    CopletInstanceData cid = ((CopletLayout)layout).getCopletInstanceData();
+                    CopletInstance cid = ((CopletLayout)layout).getCopletInstanceData();
                     this.addValues(cid.getId(), state, cid.getAttributes(), "attributes/", true);
                     this.addValues(cid.getId(), state, cid.getTemporaryAttributes(), "temporaryAttributes/", true);
                 }
                 session.setAttribute("portal-history", history);
             }
         }
-        context.invokeNext(layout, service, handler);
+        rendererContext.invokeNext(layout, service, handler);
     }
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.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/ParameterAspect.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java Sun Jul 30 11:41:45 2006
@@ -59,12 +59,12 @@
     /**
      * @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,
+    public void toSAX(RendererAspectContext rendererContext,
                       Layout layout,
                       PortalService service,
                       ContentHandler contenthandler)
     throws SAXException {
-        final PreparedConfiguration config = (PreparedConfiguration)context.getAspectConfiguration();
+        final PreparedConfiguration config = (PreparedConfiguration)rendererContext.getAspectConfiguration();
 
         Map parameter = layout.getParameters();
         if (parameter.size() > 0) {
@@ -79,7 +79,7 @@
             XMLUtils.startElement(contenthandler, config.tagName);
         }
 
-        context.invokeNext( layout, service, contenthandler );
+        rendererContext.invokeNext( layout, service, contenthandler );
 
         XMLUtils.endElement(contenthandler, config.tagName);
     }



Mime
View raw message