cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r312664 - in /cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event: ./ aspect/ aspect/impl/ impl/ subscriber/impl/
Date Mon, 10 Oct 2005 15:20:29 GMT
Author: cziegeler
Date: Mon Oct 10 08:20:02 2005
New Revision: 312664

URL: http://svn.apache.org/viewcvs?rev=312664&view=rev
Log:
JavaDoc

Modified:
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/ActionEvent.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/ComparableEvent.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/ConvertableEvent.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/ConvertableEventFactory.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/CopletDataEvent.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/CopletInstanceEvent.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/Event.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/EventConverter.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/EventManager.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/LayoutEvent.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/Receiver.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/RequestEvent.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/EventAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/EventAspectContext.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/ActionCounterEventAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/ConvertableEventAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/FrameEventAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/FullScreenCopletEventAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/LinkEventAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/NoClientCachingEventAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/AbstractActionEvent.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/ChangeAspectDataEvent.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/ChangeCopletInstanceAspectDataEvent.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/ChangeCopletsJXPathEvent.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/CopletJXPathEvent.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/CopletLinkEvent.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/CopletStatusEvent.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventAspectContext.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventConverter.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/EventAspectChain.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/FullScreenCopletEvent.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/FullScreenCopletEventFactory.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/JXPathEvent.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/LayoutRemoveEvent.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/MaximizeEvent.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/PageLabelEventConverter.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/subscriber/impl/DefaulCopletDataEventSubscriber.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultChangeAspectDataEventSubscriber.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultJXPathEventSubscriber.java

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/ActionEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/ActionEvent.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/ActionEvent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/ActionEvent.java Mon Oct 10 08:20:02 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.
@@ -17,14 +17,13 @@
 
 /**
  * This event is performed "on" a target.
- * 
+ *
  * @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 ActionEvent extends Event {
 
     Object getTarget();
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/ComparableEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/ComparableEvent.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/ComparableEvent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/ComparableEvent.java Mon Oct 10 08:20:02 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,7 +21,7 @@
  * @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 ComparableEvent
     extends Event {

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/ConvertableEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/ConvertableEvent.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/ConvertableEvent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/ConvertableEvent.java Mon Oct 10 08:20:02 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.
@@ -20,7 +20,7 @@
  *
  * @author <a href="mailto:rgoers@apache.org">Ralph Goers/a>
  *
- * @version SVN $Id: $
+ * @version $Id$
  */
 public interface ConvertableEvent extends Event {
 

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/ConvertableEventFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/ConvertableEventFactory.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/ConvertableEventFactory.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/ConvertableEventFactory.java Mon Oct 10 08:20:02 2005
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -24,7 +24,7 @@
  * Interface to be implemented to create Event factories.
  *
  * @author  <a href="mailto:rgoers@apache.org">Ralph Goers</a>
- * @version SVN $Id: $
+ * @version $Id$
  */
 public interface ConvertableEventFactory extends Component, ThreadSafe {
 

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/CopletDataEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/CopletDataEvent.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/CopletDataEvent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/CopletDataEvent.java Mon Oct 10 08:20:02 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,7 +22,7 @@
  *
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  *
- * @version CVS $Id$
+ * @version $Id$
  */
 public interface CopletDataEvent 
     extends ActionEvent {

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/CopletInstanceEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/CopletInstanceEvent.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/CopletInstanceEvent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/CopletInstanceEvent.java Mon Oct 10 08:20:02 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,7 +21,7 @@
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  *
- * @version CVS $Id$
+ * @version $Id$
  */
 public interface CopletInstanceEvent
     extends ActionEvent {

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/Event.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/Event.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/Event.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/Event.java Mon Oct 10 08:20:02 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.
@@ -20,10 +20,10 @@
  *
  * @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 Event {
-    
+
     // just a marker interface
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/EventConverter.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/EventConverter.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/EventConverter.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/EventConverter.java Mon Oct 10 08:20:02 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.
@@ -20,13 +20,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 interface EventConverter {
 
     String ROLE = EventConverter.class.getName();
-    
+
     /**
      * Encode an event.
      * This is used to "activate" events using a link
@@ -34,7 +34,7 @@
      * @return A unique string representation for this event
      */
     String encode(Event event);
-    
+
     /**
      * Decode an event
      * This is used to "activate" events using a link
@@ -47,7 +47,7 @@
      * This notifies the converter that a new event processing phase starts
      */
     void start();
-    
+
     /**
      * This notifies the converter that an event processing phase ends
      */

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/EventManager.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/EventManager.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/EventManager.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/EventManager.java Mon Oct 10 08:20:02 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.
@@ -24,16 +24,16 @@
  * can subscribe itself for a specific class (or classes) of events.
  * All Events have a common ancestor type {@link Event} and the event types are 
  * identified by a (sub)class
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public interface EventManager {
- 
+
     /**
      * Represents the role of the service
      */
     String ROLE = EventManager.class.getName(); 
-    
+
     /**
      * Process the events
      */
@@ -55,5 +55,4 @@
      * Unsubscribes a receiver for all events.
      */
     void unsubscribe(Receiver receiver);
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/LayoutEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/LayoutEvent.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/LayoutEvent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/LayoutEvent.java Mon Oct 10 08:20:02 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,7 +22,7 @@
  * @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 LayoutEvent extends ActionEvent {
 

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/Receiver.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/Receiver.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/Receiver.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/Receiver.java Mon Oct 10 08:20:02 2005
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -37,7 +37,7 @@
  *
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  *
- * @version CVS $Id$
+ * @version $Id$
  */
 public interface Receiver {
 

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/RequestEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/RequestEvent.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/RequestEvent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/RequestEvent.java Mon Oct 10 08:20:02 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,10 +21,10 @@
  * @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 RequestEvent 
     extends Event {
-    
+
     String getRequestParameterName();
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/EventAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/EventAspect.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/EventAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/EventAspect.java Mon Oct 10 08:20:02 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,7 +22,7 @@
  * @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 EventAspect {
 

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/EventAspectContext.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/EventAspectContext.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/EventAspectContext.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/EventAspectContext.java Mon Oct 10 08:20:02 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,11 +25,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$
+ *
+ * @version $Id$
  */
 public interface EventAspectContext {
-    
+
     /**
      * Invoke next aspect 
      */
@@ -39,12 +39,12 @@
      * Get the {@link Parameters} of the aspect.
      */
     Parameters getAspectParameters();
-    
+
     /**
      * Get the encoder
      */
     EventConverter getEventConverter();
-    
+
     /**
      * Get the object model
      */

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java Mon Oct 10 08:20:02 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.
@@ -35,8 +35,8 @@
  *
  * @author <a href="mailto:juergen.seitz@basf-it-services.com">J&uuml;rgen Seitz</a>
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public abstract class AbstractContentEventAspect
     extends AbstractLogEnabled
@@ -44,7 +44,7 @@
 
     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 {
@@ -52,9 +52,9 @@
     }
 
     protected abstract String getRequestParameterName();
-    
+
     protected abstract int getRequiredValueCount();
-    
+
     /**
      * Custom publishing of an event.
      * The real values for the event are contained in the array
@@ -63,7 +63,7 @@
      * @param values  The values contained in the request
      */
     protected abstract void publish(EventManager publisher, Layout layout, String[] values);
-    
+
     /**
      * Publish the event.
      * This method gets the layout object from the first two
@@ -76,8 +76,8 @@
             this.publish( publisher, layout, values);
         }
     }
-    
-    /* (non-Javadoc)
+
+    /**
      * @see org.apache.cocoon.portal.event.aspect.EventAspect#process(org.apache.cocoon.portal.event.aspect.EventAspectContext, org.apache.cocoon.portal.PortalService)
      */
     public void process(EventAspectContext context, PortalService service) {
@@ -109,7 +109,7 @@
                         tokenNumber = tokenNumber + 1;
                         tokenCount++;
 					}
-                    
+
                     if ( tokenCount == this.getRequiredValueCount() ) {
                         String [] eventValues = new String[tokenCount];
                                         
@@ -118,7 +118,7 @@
                         
                             tokenNumber = tokenNumber + 1;
                         } 
-                    
+
                         this.publish( service, publisher, eventValues );
 
                     } else {
@@ -130,5 +130,4 @@
         // and invoke next one
         context.invokeNext(service);
     }
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/ActionCounterEventAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/ActionCounterEventAspect.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/ActionCounterEventAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/ActionCounterEventAspect.java Mon Oct 10 08:20:02 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.
@@ -39,7 +39,7 @@
  * @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 ActionCounterEventAspect
 	extends AbstractLogEnabled
@@ -52,7 +52,7 @@
     /** The name of the parameter to check */
     protected String parameterName;
 
-	/* (non-Javadoc)
+	/**
 	 * @see org.apache.cocoon.portal.event.aspect.EventAspect#process(org.apache.cocoon.portal.event.aspect.EventAspectContext, org.apache.cocoon.portal.PortalService)
 	 */
 	public void process(EventAspectContext context, PortalService service) {
@@ -87,7 +87,7 @@
             }
         }
         service.getComponentManager().getLinkService().addUniqueParameterToLink( requestParameterName, String.valueOf(actionCount));
-        
+
         final Response response = ObjectModelHelper.getResponse( context.getObjectModel() );
         response.setHeader("Cache-Control", "no-cache");
         response.addHeader("Cache-Control", "no-store");
@@ -95,7 +95,7 @@
         response.setHeader("Expires", "Thu, 01 Jan 2000 00:00:00 GMT");
 	}
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.avalon.framework.parameters.Parameterizable#parameterize(org.apache.avalon.framework.parameters.Parameters)
      */
     public void parameterize(Parameters parameters) 

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/ConvertableEventAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/ConvertableEventAspect.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/ConvertableEventAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/ConvertableEventAspect.java Mon Oct 10 08:20:02 2005
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -42,7 +42,7 @@
  * them in request attributes for processing by EventAspects that follow.
  *
  * @author <a href="mailto:rgoers@apache.org">Ralph Goers</a>
- * @version SVN $Id:  $
+ * @version $Id$
  */
 public class ConvertableEventAspect extends AbstractLogEnabled
 	implements EventAspect, ThreadSafe, Serviceable {
@@ -56,7 +56,7 @@
         this.manager = manager;
     }
 
-	/* (non-Javadoc)
+	/**
 	 * @see org.apache.cocoon.portal.event.aspect.EventAspect#process(org.apache.cocoon.portal.event.aspect.EventAspectContext, org.apache.cocoon.portal.PortalService)
 	 */
 	public void process(EventAspectContext context, PortalService service) {
@@ -86,7 +86,6 @@
                 }
             }
         }
-
         context.invokeNext( service );
 	}
 

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/FrameEventAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/FrameEventAspect.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/FrameEventAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/FrameEventAspect.java Mon Oct 10 08:20:02 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.
@@ -26,8 +26,8 @@
  * @author <a href="mailto:juergen.seitz@basf-it-services.com">J&uuml;rgen Seitz</a>
  * @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 FrameEventAspect extends AbstractContentEventAspect {
 
@@ -40,12 +40,12 @@
         return 3;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.cocoon.portal.event.aspect.impl.AbstractContentEventAspect#publish(org.apache.cocoon.portal.event.Publisher, org.apache.cocoon.portal.layout.Layout, java.lang.String[])
+    /**
+     * @see org.apache.cocoon.portal.event.aspect.impl.AbstractContentEventAspect#publish(EventManager, org.apache.cocoon.portal.layout.Layout, java.lang.String[])
      */
     protected void publish(EventManager publisher,
-                             Layout layout,
-                             String[] values) {
+                           Layout layout,
+                           String[] values) {
         if (layout instanceof FrameLayout) {
             final Event e = new ChangeAspectDataEvent(layout, "frame", values[2]);
             publisher.send(e);
@@ -56,5 +56,4 @@
                     + " is not a FrameLayout.");
         }
     }
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/FullScreenCopletEventAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/FullScreenCopletEventAspect.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/FullScreenCopletEventAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/FullScreenCopletEventAspect.java Mon Oct 10 08:20:02 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,8 +40,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 FullScreenCopletEventAspect
 	extends AbstractLogEnabled
@@ -53,15 +53,15 @@
                 Initializable {
 
     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.event.aspect.EventAspect#process(org.apache.cocoon.portal.event.aspect.EventAspectContext, org.apache.cocoon.portal.PortalService)
 	 */
 	public void process(EventAspectContext context, PortalService service) {
@@ -123,7 +123,7 @@
         }
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.avalon.framework.activity.Initializable#initialize()
      */
     public void initialize() 

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/LinkEventAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/LinkEventAspect.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/LinkEventAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/LinkEventAspect.java Mon Oct 10 08:20:02 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,8 +24,8 @@
 /**
  *
  * @author <a href="mailto:juergen.seitz@basf-it-services.com">J&uuml;rgen Seitz</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public class LinkEventAspect extends AbstractContentEventAspect {
 
@@ -38,7 +38,7 @@
         return 4;
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.cocoon.portal.event.aspect.impl.AbstractContentEventAspect#publish(org.apache.cocoon.portal.event.Publisher, org.apache.cocoon.portal.layout.Layout, java.lang.String[])
      */
     protected void publish(EventManager publisher,
@@ -61,5 +61,4 @@
                     + " is not a LinkLayout.");
         }
     }
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/NoClientCachingEventAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/NoClientCachingEventAspect.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/NoClientCachingEventAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/NoClientCachingEventAspect.java Mon Oct 10 08:20:02 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,7 +30,7 @@
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  *
- * @version CVS $Id$
+ * @version $Id$
  */
 public class NoClientCachingEventAspect
 	extends AbstractLogEnabled

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java Mon Oct 10 08:20:02 2005
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -39,7 +39,7 @@
  *
  * @author Ralph Goers
  *
- * @version CVS $Id:$
+ * @version $Id$
  */
 public class PageLabelEventAspect
     extends AbstractLogEnabled

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java Mon Oct 10 08:20:02 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,8 +34,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 RequestParameterEventAspect
 	extends AbstractLogEnabled
@@ -65,8 +65,8 @@
             }
         }
     }
-    
-	/* (non-Javadoc)
+
+	/**
 	 * @see org.apache.cocoon.portal.event.aspect.EventAspect#process(org.apache.cocoon.portal.event.aspect.EventAspectContext, org.apache.cocoon.portal.PortalService)
 	 */
 	public void process(EventAspectContext context, PortalService service) {
@@ -74,7 +74,7 @@
         final Parameters config = context.getAspectParameters();
         final String requestParameterNames = config.getParameter("parameter-name", LinkService.DEFAULT_REQUEST_EVENT_PARAMETER_NAME);
         boolean processedDefault = false;
-        
+
         StringTokenizer tokenizer = new StringTokenizer(requestParameterNames, ", ");
         while ( tokenizer.hasMoreTokens() ) {
             final String currentName = tokenizer.nextToken();
@@ -88,5 +88,4 @@
         }
         context.invokeNext( service );        
 	}
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/AbstractActionEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/AbstractActionEvent.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/AbstractActionEvent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/AbstractActionEvent.java Mon Oct 10 08:20:02 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.
@@ -19,25 +19,24 @@
 
 /**
  * This event is performed on a target
- * 
+ *
  * @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: AbstractActionEvent.java,v 1.3 2004/03/05 13:02:12 bdelacretaz Exp $
+ *
+ * @version $Id$
  */
 public abstract class AbstractActionEvent implements ActionEvent {
 
     protected Object target;
-    
+
     public AbstractActionEvent(Object target) {
         this.target = target;
     }
-    
+
     /**
      * @return Object
      */
     public Object getTarget() {
         return this.target;
     }
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/ChangeAspectDataEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/ChangeAspectDataEvent.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/ChangeAspectDataEvent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/ChangeAspectDataEvent.java Mon Oct 10 08:20:02 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,20 +24,19 @@
  * This events set the aspect data for an {@link Aspectalizable} object
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
- * 
- * @version CVS $Id: ChangeAspectDataEvent.java,v 1.6 2004/03/05 13:02:12 bdelacretaz Exp $
+ *
+ * @version $Id$
  */
 public class ChangeAspectDataEvent
     extends AbstractActionEvent
     implements ActionEvent, RequestEvent, ComparableEvent {
 
     protected String aspectName;
-    
+
     protected Object data;
-    
+
     protected String requestParameterName;
-    
-    
+
     public ChangeAspectDataEvent(Aspectalizable target, String aspectName, Object data) {
         super(target);
         this.aspectName = aspectName;
@@ -65,12 +64,11 @@
         return this.target;
     }
 
-
     public Aspectalizable getAspectalizable() {
         return (Aspectalizable)this.target;
     }
-    
-    /* (non-Javadoc)
+
+    /**
      * @see org.apache.cocoon.portal.event.RequestEvent#getRequestParameterName()
      */
     public String getRequestParameterName() {
@@ -80,8 +78,8 @@
     public void setRequestParameterName(String value) {
         this.requestParameterName = value;
     }
-    
-    /* (non-Javadoc)
+
+    /**
      * @see org.apache.cocoon.portal.event.ComparableEvent#equalsEvent(org.apache.cocoon.portal.event.ComparableEvent)
      */
     public boolean equalsEvent(ComparableEvent event) {
@@ -93,5 +91,4 @@
 
         return false;
     }
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/ChangeCopletInstanceAspectDataEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/ChangeCopletInstanceAspectDataEvent.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/ChangeCopletInstanceAspectDataEvent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/ChangeCopletInstanceAspectDataEvent.java Mon Oct 10 08:20:02 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,8 +22,8 @@
  * This events set the aspect data for a coplet instance object
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
- * 
- * @version CVS $Id: ChangeCopletInstanceAspectDataEvent.java,v 1.3 2004/03/05 13:02:12 bdelacretaz Exp $
+ *
+ * @version $Id$
  */
 public class ChangeCopletInstanceAspectDataEvent
     extends ChangeAspectDataEvent
@@ -32,5 +32,4 @@
     public ChangeCopletInstanceAspectDataEvent(CopletInstanceData target, String aspectName, Object data) {
         super( target, aspectName, data );
     }
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/ChangeCopletsJXPathEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/ChangeCopletsJXPathEvent.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/ChangeCopletsJXPathEvent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/ChangeCopletsJXPathEvent.java Mon Oct 10 08:20:02 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.
@@ -19,11 +19,11 @@
 import org.apache.cocoon.portal.event.CopletDataEvent;
 
 /**
- * This event changes the value of all instances of a coplet data
+ * This event changes the value of all instances of a coplet data.
  *
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * 
- * @version CVS $Id: ChangeCopletsJXPathEvent.java,v 1.2 2004/03/05 13:02:12 bdelacretaz Exp $
+ *
+ * @version $Id$
  */
 public class ChangeCopletsJXPathEvent
 extends AbstractActionEvent 
@@ -31,7 +31,7 @@
 
     protected String path;
     protected Object value;
-    
+
     /**
      * Constructor
      * @param target The coplet data
@@ -57,5 +57,4 @@
     public Object getValue() {
         return this.value;
     }
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/CopletJXPathEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/CopletJXPathEvent.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/CopletJXPathEvent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/CopletJXPathEvent.java Mon Oct 10 08:20:02 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.
@@ -19,11 +19,11 @@
 import org.apache.cocoon.portal.event.CopletInstanceEvent;
 
 /**
- * This events changes the value of an instance
+ * This events changes the value of an instance.
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
- * 
- * @version CVS $Id: CopletJXPathEvent.java,v 1.2 2004/03/05 13:02:12 bdelacretaz Exp $
+ *
+ * @version $Id$
  */
 public class CopletJXPathEvent
     extends JXPathEvent
@@ -32,5 +32,4 @@
     public CopletJXPathEvent(CopletInstanceData target, String path, Object value) {
         super( target, path, value );
     }
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/CopletLinkEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/CopletLinkEvent.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/CopletLinkEvent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/CopletLinkEvent.java Mon Oct 10 08:20:02 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.
@@ -20,20 +20,20 @@
 
 /**
  * This class realizes a link event created by the EventLinkTransformer.
- *  
+ *
  * @author <a href="mailto:bluetkemeier@s-und-n.de">Bj&ouml;rn L&uuml;tkemeier</a>
- * 
- * @version CVS $Id: CopletLinkEvent.java,v 1.3 2004/03/05 13:02:12 bdelacretaz Exp $
+ *
+ * @version $Id$
  */
 public class CopletLinkEvent
 extends AbstractActionEvent
 implements CopletInstanceEvent {
-    
+
     /**
      * The link to be handled by this event.
      */
     protected String link;
-    
+
     /**
      * Creates a new LinkEvent.
      */
@@ -41,7 +41,7 @@
         super(target);
         this.link = link;
     }
-    
+
     /**
      * Gets this event's link.
      */

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/CopletStatusEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/CopletStatusEvent.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/CopletStatusEvent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/CopletStatusEvent.java Mon Oct 10 08:20:02 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.
@@ -26,7 +26,7 @@
  * @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 CopletStatusEvent
     implements Event, ComparableEvent, CopletInstanceEvent {

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventAspectContext.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventAspectContext.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventAspectContext.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventAspectContext.java Mon Oct 10 08:20:02 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,8 +28,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 final class DefaultEventAspectContext 
     implements EventAspectContext {
@@ -37,7 +37,7 @@
     private Iterator iterator;
     private Iterator configIterator;
     private Parameters config;
-    
+
     private Map objectModel;
     private EventConverter converter;
 
@@ -45,9 +45,9 @@
         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.event.aspect.EventAspectContext#invokeNext(org.apache.cocoon.portal.PortalService)
 	 */
 	public void invokeNext(PortalService service) {
 		if (iterator.hasNext()) {
@@ -58,8 +58,8 @@
 
 	}
 
-	/* (non-Javadoc)
-	 * @see org.apache.cocoon.portal.layout.renderer.RendererAspectContext#getConfiguration()
+	/**
+	 * @see org.apache.cocoon.portal.event.aspect.EventAspectContext#getAspectParameters()
 	 */
 	public Parameters getAspectParameters() {
 		return this.config;
@@ -71,7 +71,7 @@
     public EventConverter getEventConverter(){
         return this.converter;
     }
-    
+
     /**
      * Get the object model
      */
@@ -92,5 +92,4 @@
 	public void setObjectModel(Map map) {
 		objectModel = map;
 	}
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventConverter.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventConverter.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventConverter.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventConverter.java Mon Oct 10 08:20:02 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,8 +32,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 DefaultEventConverter
     extends AbstractLogEnabled
@@ -41,17 +41,17 @@
 
     protected static final String DECODE_LIST = DefaultEventConverter.class.getName() + "D";
     protected static final String ENCODE_LIST = DefaultEventConverter.class.getName() + "E";
-    
+
     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.event.EventConverter#encode(org.apache.cocoon.portal.event.Event)
      */
     public String encode(Event event) {
@@ -74,10 +74,9 @@
         } finally {
             this.manager.release(service);
         }
-        
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.cocoon.portal.event.EventConverter#decode(java.lang.String)
      */
     public Event decode(String value) {
@@ -101,7 +100,7 @@
         return null;
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.cocoon.portal.event.EventConverter#start()
      */
     public void start() {
@@ -119,8 +118,8 @@
             this.manager.release(service);
         }
     }
-    
-    /* (non-Javadoc)
+
+    /**
      * @see org.apache.cocoon.portal.event.EventConverter#finish()
      */
     public void finish() {
@@ -135,7 +134,7 @@
         }
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.cocoon.portal.event.EventConverter#isMarshallEvents()
      */
     public boolean isMarshallEvents() {

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java Mon Oct 10 08:20:02 2005
@@ -17,6 +17,7 @@
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -137,7 +138,7 @@
     public void initialize()
     throws Exception {
         // create tree of all Events
-        //this.getHierarchyInfo(Event.class);
+        // this.getHierarchyInfo(Event.class);
 
         // subscribe all configured receiver roles
         Configuration roles = this.configuration.getChild("receiver-roles", false);
@@ -273,7 +274,6 @@
     }
 
     protected static final class MethodInfo {
-        
         public Class eventClass;
         public Method method;
     }
@@ -294,8 +294,8 @@
                             info.eventClass = params[0];
                             info.method = current;
                             result.add(info);
-                            //HierarchyInfo hi = this.getHierarchyInfo(info.eventClass);
-                            //this.print(hi);
+                            // HierarchyInfo hi = this.getHierarchyInfo(info.eventClass);
+                            // this.print(hi);
                         }
                     }
                 }
@@ -351,18 +351,19 @@
      * Create a hierarchy information.
      */
     protected HierarchyInfo getHierarchyInfo(Class c) {
-        HierarchyInfo info = (HierarchyInfo) this.eventHierarchy.get(c.getName());
+        final String className = c.getName();
+        HierarchyInfo info = (HierarchyInfo) this.eventHierarchy.get(className);
         if ( info == null ) {
-            info = new HierarchyInfo(c.getName());
-            this.eventHierarchy.put(c.getName(), info);
+            info = new HierarchyInfo(className);
+
             final Class parent = c.getSuperclass();
             this.addToHierarchy(info, parent);
+
             Class[] interfaces = c.getInterfaces();
             for (int i=0; i<interfaces.length; i++) {
-                if ( parent == null || !interfaces[i].isAssignableFrom(parent) ) {
-                    this.addToHierarchy(info, interfaces[i]);
-                }
+                this.addToHierarchy(info, interfaces[i]);
             }
+            this.eventHierarchy.put(className, info);
         }
         return info;
     }
@@ -370,7 +371,7 @@
     protected void print(HierarchyInfo info) {
         if ( info.className.equals(Event.class.getName())) return;
         System.out.println("-------------------------------- " + info.className);
-        if ( info.getParents() == null ) return;
+        if ( info.getParents().size() == 0 ) return;
         System.out.println("Parents: ");
         Iterator i = info.getParents().iterator();
         while ( i.hasNext() ) {
@@ -379,17 +380,26 @@
         }
         System.out.println("===============================================================");
         System.out.println();
-        i = info.getParents().iterator();
-        while ( i.hasNext() ) {
-            HierarchyInfo c = (HierarchyInfo)i.next();
-            this.print(c);
-        }
     }
+
     protected void addToHierarchy(HierarchyInfo info, Class c) {
         if ( c != null && Event.class.isAssignableFrom(c) ) {
-            info.addToParents(this.getHierarchyInfo(c));
+            final HierarchyInfo parent = this.getHierarchyInfo(c);
+            info.addToParents(parent);
+            // now add all parents from the parent :)
+            this.addToHierarchy(info, parent.getParents());
         }
     }
+
+    protected void addToHierarchy(HierarchyInfo info, List parents) {
+        final Iterator i = parents.iterator();
+        while ( i.hasNext() ) {
+            final HierarchyInfo current = (HierarchyInfo)i.next();
+            info.addToParents(current);
+            this.addToHierarchy(info, current.getParents());
+        }        
+    }
+
     protected static final class HierarchyInfo {
 
         protected final String className;
@@ -417,10 +427,16 @@
         }
 
         public List getReceivers() {
+            if ( this.receivers == null ) {
+                return Collections.EMPTY_LIST;
+            }
             return this.receivers;
         }
 
         public List getParents() {
+            if ( this.parents == null ) {
+                return Collections.EMPTY_LIST;
+            }
             return this.parents;
         }
     }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/EventAspectChain.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/EventAspectChain.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/EventAspectChain.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/EventAspectChain.java Mon Oct 10 08:20:02 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,15 +29,15 @@
  *
  * @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: EventAspectChain.java,v 1.3 2004/03/05 13:02:12 bdelacretaz Exp $
+ *
+ * @version $Id$
  */
 public final class EventAspectChain {
-    
+
     private List aspects = new ArrayList();
-    
+
     private List configs = new ArrayList();
-    
+
     public void configure(ServiceSelector selector, Configuration conf) 
     throws ConfigurationException {
         if ( conf != null ) {
@@ -58,15 +58,15 @@
             throw new ConfigurationException("No aspects configured");
         }
     }
-    
+
     public Iterator getIterator() {
         return this.aspects.iterator();
     }
-    
+
     public Iterator getConfigIterator() {
         return this.configs.iterator();
     }
-    
+
     public void dispose(ServiceSelector selector) {
         Iterator i = this.aspects.iterator();
         while (i.hasNext()) {

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/FullScreenCopletEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/FullScreenCopletEvent.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/FullScreenCopletEvent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/FullScreenCopletEvent.java Mon Oct 10 08:20:02 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.
@@ -27,7 +27,7 @@
  * @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 FullScreenCopletEvent
     extends CopletStatusEvent
@@ -61,7 +61,7 @@
         }
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.cocoon.portal.event.RequestEvent#getRequestParameterName()
      */
     public String getRequestParameterName() {

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/FullScreenCopletEventFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/FullScreenCopletEventFactory.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/FullScreenCopletEventFactory.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/FullScreenCopletEventFactory.java Mon Oct 10 08:20:02 2005
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -24,7 +24,7 @@
  * Factory to create FullScreenEvents from marshalled data.
  *
  * @author <a href="mailto:rgoers@apache.org">Ralph Goers</a>
- * @version SVN $Id: $
+ * @version $Id$
  */
 public class FullScreenCopletEventFactory implements ConvertableEventFactory {
 

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/JXPathEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/JXPathEvent.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/JXPathEvent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/JXPathEvent.java Mon Oct 10 08:20:02 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.
@@ -16,19 +16,19 @@
 package org.apache.cocoon.portal.event.impl;
 
 /**
- * This events changes the value of an instance
+ * This events changes the value of an instance.
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
- * 
- * @version CVS $Id: JXPathEvent.java,v 1.3 2004/03/05 13:02:12 bdelacretaz Exp $
+ *
+ * @version $Id$
  */
 public class JXPathEvent
     extends AbstractActionEvent {
 
     protected String path;
-    
+
     protected Object value;
-    
+
     /**
      * @return Returns the path.
      */
@@ -48,5 +48,4 @@
         this.path = path;
         this.value = value;
     }
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/LayoutRemoveEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/LayoutRemoveEvent.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/LayoutRemoveEvent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/LayoutRemoveEvent.java Mon Oct 10 08:20:02 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,8 +21,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: LayoutRemoveEvent.java,v 1.4 2004/03/05 13:02:12 bdelacretaz Exp $
+ *
+ * @version $Id$
  */
 public class LayoutRemoveEvent
     extends AbstractActionEvent
@@ -34,5 +34,4 @@
     public LayoutRemoveEvent(Object target) {
         super(target);
     }
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/MaximizeEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/MaximizeEvent.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/MaximizeEvent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/MaximizeEvent.java Mon Oct 10 08:20:02 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.
@@ -19,17 +19,17 @@
 import org.apache.cocoon.portal.layout.Layout;
 
 /**
- * This event indicates to maximize a layout
- * 
+ * This event indicates to maximize a layout.
+ *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
- * 
- * @version CVS $Id: MaximizeEvent.java,v 1.2 2004/03/05 13:02:12 bdelacretaz Exp $
+ *
+ * @version $Id$
  */
 public final class MaximizeEvent
     implements Event {
 
     private Layout layout;
-    
+
     public MaximizeEvent(Layout target) {
         this.layout = target; 
     }
@@ -37,5 +37,4 @@
     public Layout getLayout() {
         return this.layout;
     }
-    
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/PageLabelEventConverter.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/PageLabelEventConverter.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/PageLabelEventConverter.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/PageLabelEventConverter.java Mon Oct 10 08:20:02 2005
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -32,7 +32,7 @@
  * Convert events from and into strings.
  * @author Ralph Goers
  *
- * @version CVS $Id:  $
+ * @version $Id$
  */
 public class PageLabelEventConverter extends AbstractLogEnabled
     implements EventConverter, Serviceable, ThreadSafe {
@@ -44,19 +44,18 @@
 
     protected ServiceManager manager;
 
-    /* (non-Javadoc)
-    * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
-    */
+    /**
+     * @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);
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.cocoon.portal.event.EventConverter#encode(org.apache.cocoon.portal.event.Event)
      */
     public String encode(Event event) {
-
         String pageLabel = this.labelManager.getCurrentLabel();
         if (pageLabel == null) {
             pageLabel = "";
@@ -78,7 +77,7 @@
         return String.valueOf(index);
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.cocoon.portal.event.EventConverter#decode(java.lang.String)
      */
     public Event decode(String value) {
@@ -98,9 +97,9 @@
         return null;
     }
 
-    /* (non-Javadoc)
-    * @see org.apache.cocoon.portal.event.EventConverter#start()
-    */
+    /**
+     * @see org.apache.cocoon.portal.event.EventConverter#start()
+     */
     public void start() {
         String label = this.labelManager.setCurrentLabel();
         Map map = this.labelManager.getPageEventMap();
@@ -118,16 +117,16 @@
         }
     }
 
-    /* (non-Javadoc)
-    * @see org.apache.cocoon.portal.event.EventConverter#finish()
-    */
+    /**
+     * @see org.apache.cocoon.portal.event.EventConverter#finish()
+     */
     public void finish() {
         // nothing to do         
     }
 
-    /* (non-Javadoc)
-    * @see org.apache.cocoon.portal.event.EventConverter#isMarshallEvents()
-    */
+    /**
+     * @see org.apache.cocoon.portal.event.EventConverter#isMarshallEvents()
+     */
     public boolean isMarshallEvents() {
         return this.labelManager.isMarshallEvents();
     }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/subscriber/impl/DefaulCopletDataEventSubscriber.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/subscriber/impl/DefaulCopletDataEventSubscriber.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/subscriber/impl/DefaulCopletDataEventSubscriber.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/subscriber/impl/DefaulCopletDataEventSubscriber.java Mon Oct 10 08:20:02 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,8 +32,8 @@
 /**
  *
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public final class DefaulCopletDataEventSubscriber 
 implements Receiver {
@@ -59,7 +59,7 @@
             EventManager eventManager = service.getComponentManager().getEventManager();
             final String path = ((ChangeCopletsJXPathEvent)e).getPath();
             final Object value = ((ChangeCopletsJXPathEvent)e).getValue();
-                    
+  
             Iterator i = instances.iterator();
             while ( i.hasNext() ) {
                 CopletInstanceData current = (CopletInstanceData) i.next();
@@ -68,5 +68,4 @@
             }
         }
     }
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultChangeAspectDataEventSubscriber.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultChangeAspectDataEventSubscriber.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultChangeAspectDataEventSubscriber.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultChangeAspectDataEventSubscriber.java Mon Oct 10 08:20:02 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,8 +23,8 @@
 /**
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
 public final class DefaultChangeAspectDataEventSubscriber 
     implements Receiver {
@@ -40,5 +40,4 @@
         final Aspectalizable target = event.getAspectalizable();
         target.setAspectData(event.getAspectName(), event.getData());
     }
-
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultJXPathEventSubscriber.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultJXPathEventSubscriber.java?rev=312664&r1=312663&r2=312664&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultJXPathEventSubscriber.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultJXPathEventSubscriber.java Mon Oct 10 08:20:02 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,9 +22,9 @@
 
 /**
  * This subscriber processes JXPath events.
- * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  *
- * @version CVS $Id$
+ * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
+ * @version $Id$
  */
 public final class DefaultJXPathEventSubscriber 
     implements Receiver {
@@ -43,5 +43,4 @@
             jxpathContext.setValue(event.getPath(), event.getValue());
         }
     }
-
 }



Mime
View raw message