[jboss-cvs] jboss-portal/core/src/main/org/jboss/portal/core/impl/model/portal ...
Julien Viet
julien at jboss.com
Mon Jul 31 15:29:48 EDT 2006
User: julien
Date: 06/07/31 15:29:48
Modified: core/src/main/org/jboss/portal/core/impl/model/portal
ContainerContext.java
PersistentPortalObjectContainer.java
PortalObjectImpl.java
TransientPortalObjectContainer.java
Log:
- moved the portal api in the api module in order to have a standalone jar
- JBPORTAL-631 : Try to move org.jboss.portlet package to the api module
- IPC support in 2.4 (only for local portlets)
Revision Changes Path
1.5 +3 -3 jboss-portal/core/src/main/org/jboss/portal/core/impl/model/portal/ContainerContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ContainerContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/impl/model/portal/ContainerContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ContainerContext.java 6 Jan 2006 23:48:17 -0000 1.4
+++ ContainerContext.java 31 Jul 2006 19:29:48 -0000 1.5
@@ -21,18 +21,18 @@
*/
package org.jboss.portal.core.impl.model.portal;
-import org.jboss.portlet.event.PortalEventListener;
+import org.jboss.portal.node.event.PortalNodeEventListener;
import org.jboss.portal.core.model.portal.PortalObjectContainer;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public interface ContainerContext
{
/**
*/
- PortalEventListener getListener(String listenerId);
+ PortalNodeEventListener getListener(String listenerId);
/**
*/
1.41 +9 -4 jboss-portal/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PersistentPortalObjectContainer.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- PersistentPortalObjectContainer.java 19 Jul 2006 12:08:12 -0000 1.40
+++ PersistentPortalObjectContainer.java 31 Jul 2006 19:29:48 -0000 1.41
@@ -43,7 +43,7 @@
import org.jboss.portal.security.spi.provider.PermissionFactory;
import org.jboss.portal.security.spi.provider.PermissionRepository;
import org.jboss.portal.jems.hibernate.ObjectContextualizer;
-import org.jboss.portlet.event.PortalEventListener;
+import org.jboss.portal.node.event.PortalNodeEventListener;
import javax.naming.InitialContext;
import java.util.Collection;
@@ -54,7 +54,7 @@
/**
*
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- * @version $Revision: 1.40 $
+ * @version $Revision: 1.41 $
*/
public class PersistentPortalObjectContainer extends AbstractPortalObjectContainer
implements AuthorizationDomain, DomainConfigurator, PermissionRepository, PermissionFactory
@@ -91,9 +91,14 @@
{
ctx = new ContainerContext()
{
- public PortalEventListener getListener(String listenerId)
+ public PortalNodeEventListener getListener(String listenerId)
{
- return portalEventListenerRegistry.getListener(listenerId);
+ Object listener = portalEventListenerRegistry.getListener(listenerId);
+ if (listener instanceof PortalNodeEventListener)
+ {
+ return (PortalNodeEventListener)listener;
+ }
+ return null;
}
public PortalObjectContainer getContainer()
{
1.16 +20 -31 jboss-portal/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PortalObjectImpl.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- PortalObjectImpl.java 26 Jul 2006 22:03:54 -0000 1.15
+++ PortalObjectImpl.java 31 Jul 2006 19:29:48 -0000 1.16
@@ -27,10 +27,10 @@
import org.jboss.portal.core.model.portal.DuplicatePortalObjectException;
import org.jboss.portal.core.api.JBossPortalNode;
import org.jboss.portal.common.path.RelativePathParser;
-import org.jboss.portlet.PortalNode;
-import org.jboss.portlet.event.node.PortalNodeEvent;
-import org.jboss.portlet.event.node.PortalNodeEventBubbler;
-import org.jboss.portlet.event.node.PortalNodeEventListener;
+import org.jboss.portal.node.PortalNode;
+import org.jboss.portal.node.event.PortalNodeEvent;
+import org.jboss.portal.node.event.PortalNodeEventContext;
+import org.jboss.portal.node.event.PortalNodeEventListener;
import org.apache.log4j.Logger;
import java.util.Collection;
@@ -42,7 +42,7 @@
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
*/
public abstract class PortalObjectImpl implements PortalObject
{
@@ -425,35 +425,30 @@
return object.getId();
}
- public PortalNodeEvent firePreEvent(PortalNodeEvent event)
+ public PortalNodeEvent fireEvent(PortalNodeEvent event)
{
- Bubbler bubbler = new Bubbler(object, true);
- return bubbler.dispatch(event);
- }
-
- public PortalNodeEvent firePostEvent(PortalNodeEvent event)
- {
- Bubbler bubbler = new Bubbler(object, false);
- return bubbler.dispatch(event);
+ Bubbler bubbler = new Bubbler(object, event);
+ return bubbler.dispatch();
}
}
- private static class Bubbler implements PortalNodeEventBubbler
+ private static class Bubbler implements PortalNodeEventContext
{
- private boolean pre;
+ /** . */
+ private PortalNodeEvent event;
+ /** . */
private PortalObjectImpl object;
- public Bubbler(PortalObjectImpl object, boolean pre)
+ public Bubbler(PortalObjectImpl object, PortalNodeEvent event)
{
this.object = object;
- this.pre = pre;
+ this.event = event;
}
- public PortalNodeEvent dispatch(PortalNodeEvent previousEvent)
+ public PortalNodeEvent dispatch()
{
- PortalNodeEvent nextEvent = null;
PortalNodeEventListener listener = null;
if (object.getListener() != null)
{
@@ -466,13 +461,14 @@
}
// Dispatch to the listener
+ PortalNodeEvent nextEvent = null;
if (listener != null)
{
PortalObjectImpl current = object;
try
{
object = (PortalObjectImpl)object.getParent();
- nextEvent = listener.onEvent(this, previousEvent);
+ nextEvent = listener.onEvent(this, event);
}
finally
{
@@ -487,18 +483,16 @@
try
{
object = (PortalObjectImpl)object.getParent();
- nextEvent = dispatch(previousEvent);
+ nextEvent = dispatch();
}
finally
{
object = current;
}
}
- else
- {
- nextEvent = previousEvent;
- }
}
+
+ //
return nextEvent;
}
@@ -506,11 +500,6 @@
{
return object.getPortalNode();
}
-
- public int getType()
- {
- return pre ? PRE_EVENT : POST_EVENT;
- }
}
private static class CollectionImpl implements Collection
1.11 +10 -5 jboss-portal/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TransientPortalObjectContainer.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- TransientPortalObjectContainer.java 11 Jul 2006 20:50:27 -0000 1.10
+++ TransientPortalObjectContainer.java 31 Jul 2006 19:29:48 -0000 1.11
@@ -27,12 +27,12 @@
import org.jboss.portal.core.event.PortalEventListenerRegistry;
import org.jboss.portal.core.api.JBossPortalNode;
import org.jboss.portal.security.spi.provider.AuthorizationDomain;
-import org.jboss.portlet.event.PortalEventListener;
+import org.jboss.portal.node.event.PortalNodeEventListener;
/**
*
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public class TransientPortalObjectContainer extends AbstractPortalObjectContainer
{
@@ -49,9 +49,14 @@
//
ctx = new ContainerContext()
{
- public PortalEventListener getListener(String listenerId)
+ public PortalNodeEventListener getListener(String listenerId)
{
- return portalEventListenerRegistry.getListener(listenerId);
+ Object listener = portalEventListenerRegistry.getListener(listenerId);
+ if (listener instanceof PortalEventListenerRegistry)
+ {
+ return (PortalNodeEventListener)listener;
+ }
+ return null;
}
public PortalObjectContainer getContainer()
{
More information about the jboss-cvs-commits
mailing list