[jboss-svn-commits] JBoss Portal SVN: r5353 - in trunk/core/src: main/org/jboss/portal/core/impl/model/portal resources/portal-core-sar/META-INF

[jboss-svn-commits at lists.jboss.org]

Author: julien at jboss.com
Date: 2006-10-07 18:01:09 -0400 (Sat, 07 Oct 2006)
New Revision: 5353

Modified:
   trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContainerContext.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java
   trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
Log:
remove unnecessary injection of listener registry into portal object container

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java	2006-10-07 13:56:03 UTC (rev 5352)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java	2006-10-07 22:01:09 UTC (rev 5353)
@@ -21,7 +21,6 @@
 */
 package org.jboss.portal.core.impl.model.portal;
 
-import org.jboss.portal.core.event.PortalEventListenerRegistry;
 import org.jboss.portal.core.model.portal.PortalObjectContainer;
 import org.jboss.portal.jems.as.system.AbstractJBossService;
 
@@ -33,18 +32,5 @@
 {
 
    /** . */
-   protected PortalEventListenerRegistry portalEventListenerRegistry;
-
-   /** . */
    protected ContainerContext ctx;
-
-   public PortalEventListenerRegistry getPortalEventListenerRegistry()
-   {
-      return portalEventListenerRegistry;
-   }
-
-   public void setPortalEventListenerRegistry(PortalEventListenerRegistry portalEventListenerRegistry)
-   {
-      this.portalEventListenerRegistry = portalEventListenerRegistry;
-   }
 }

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContainerContext.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContainerContext.java	2006-10-07 13:56:03 UTC (rev 5352)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContainerContext.java	2006-10-07 22:01:09 UTC (rev 5353)
@@ -32,10 +32,6 @@
 {
    /**
     */
-   PortalNodeEventListener getListener(String listenerId);
-
-   /**
-    */
    PortalObjectContainer getContainer();
 
 //   /**

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java	2006-10-07 13:56:03 UTC (rev 5352)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java	2006-10-07 22:01:09 UTC (rev 5353)
@@ -42,7 +42,6 @@
 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.portal.api.node.event.PortalNodeEventListener;
 
 import javax.naming.InitialContext;
 import java.util.Collection;
@@ -90,15 +89,6 @@
    {
       ctx = new ContainerContext()
       {
-         public PortalNodeEventListener getListener(String listenerId)
-         {
-            Object listener = portalEventListenerRegistry.getListener(listenerId);
-            if (listener instanceof PortalNodeEventListener)
-            {
-               return (PortalNodeEventListener)listener;
-            }
-            return null;
-         }
          public PortalObjectContainer getContainer()
          {
             return PersistentPortalObjectContainer.this;

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java	2006-10-07 13:56:03 UTC (rev 5352)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java	2006-10-07 22:01:09 UTC (rev 5353)
@@ -24,9 +24,7 @@
 import org.jboss.portal.core.model.portal.PortalObjectContainer;
 import org.jboss.portal.core.model.portal.Context;
 import org.jboss.portal.core.model.portal.PortalObject;
-import org.jboss.portal.core.event.PortalEventListenerRegistry;
 import org.jboss.portal.security.spi.provider.AuthorizationDomain;
-import org.jboss.portal.api.node.event.PortalNodeEventListener;
 
 /**
  *
@@ -34,13 +32,15 @@
  * @version $Revision$
  */
 public class TransientPortalObjectContainer extends AbstractPortalObjectContainer
+//   implements AuthorizationDomain, DomainConfigurator, PermissionRepository, PermissionFactory
 {
 
-   protected PortalEventListenerRegistry portalEventListenerRegistry;
+   /** . */
    protected ObjectNode root;
+
+   /** . */
    protected ContainerContext ctx;
 
-
    protected void createService() throws Exception
    {
       super.createService();
@@ -48,15 +48,6 @@
       //
       ctx = new ContainerContext()
       {
-         public PortalNodeEventListener getListener(String listenerId)
-         {
-            Object listener = portalEventListenerRegistry.getListener(listenerId);
-            if (listener instanceof PortalEventListenerRegistry)
-            {
-               return (PortalNodeEventListener)listener;
-            }
-            return null;
-         }
          public PortalObjectContainer getContainer()
          {
             return TransientPortalObjectContainer.this;

Modified: trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml	2006-10-07 13:56:03 UTC (rev 5352)
+++ trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml	2006-10-07 22:01:09 UTC (rev 5353)
@@ -528,9 +528,6 @@
       <depends
          optional-attribute-name="AuthorizationDomainRegistry"
          proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends>
-      <depends
-         optional-attribute-name="PortalEventListenerRegistry"
-         proxy-type="attribute">portal:service=ListenerRegistry</depends>
       <attribute name="SessionFactoryJNDIName">java:/portal/PortalObjectSessionFactory</attribute>
    </mbean>