portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl PortletRendererImpl.java
Date Mon, 23 Feb 2004 13:14:28 GMT
weaver      2004/02/23 05:14:28

  Modified:    portal/src/java/org/apache/jetspeed/aggregator
                        BasicAggregator.java
               portal/src/java/org/apache/jetspeed/aggregator/impl
                        PortletRendererImpl.java
  Log:
  now uses registry component
  
  Revision  Changes    Path
  1.8       +5 -3      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/BasicAggregator.java
  
  Index: BasicAggregator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/BasicAggregator.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- BasicAggregator.java	12 Jan 2004 06:39:39 -0000	1.7
  +++ BasicAggregator.java	23 Feb 2004 13:14:28 -0000	1.8
  @@ -61,6 +61,8 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  +import org.apache.jetspeed.Jetspeed;
  +import org.apache.jetspeed.components.portletregsitry.PortletRegistryComponent;
   import org.apache.jetspeed.container.PortletContainerFactory;
   import org.apache.jetspeed.cps.BaseCommonService;
   import org.apache.jetspeed.cps.CPSInitializationException;
  @@ -71,7 +73,6 @@
   import org.apache.jetspeed.profiler.ProfileLocator;
   import org.apache.jetspeed.profiler.Profiler;
   import org.apache.jetspeed.request.RequestContext;
  -import org.apache.jetspeed.registry.JetspeedPortletRegistry;
   import org.apache.pluto.PortletContainer;
   import org.apache.pluto.PortletContainerException;
   import org.apache.pluto.om.portlet.PortletDefinition;
  @@ -207,7 +208,8 @@
               // Load Portlet from registry
               // 
               System.out.println("*** Getting portlet from registry: " + fragment.getName());
  -            PortletDefinition portletDefinition = JetspeedPortletRegistry.getPortletDefinitionByUniqueName(fragment.getName());
  +			PortletRegistryComponent regsitry = (PortletRegistryComponent) Jetspeed.getComponentManager().getComponent(PortletRegistryComponent.class);
  +            PortletDefinition portletDefinition = regsitry.getPortletDefinitionByUniqueName(fragment.getName());
               if (portletDefinition == null)
               {
                   throw new JetspeedException("Failed to load: " + fragment.getName() + "
from registry");
  
  
  
  1.6       +5 -3      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
  
  Index: PortletRendererImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PortletRendererImpl.java	16 Jan 2004 20:02:27 -0000	1.5
  +++ PortletRendererImpl.java	23 Feb 2004 13:14:28 -0000	1.6
  @@ -59,17 +59,18 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.apache.fulcrum.InitializationException;
  +import org.apache.jetspeed.Jetspeed;
   import org.apache.jetspeed.aggregator.PortletRenderer;
   import org.apache.jetspeed.aggregator.ContentDispatcher;
   import org.apache.jetspeed.aggregator.ContentDispatcherCtrl;
   import org.apache.jetspeed.aggregator.PortletWindowFactory;
   import org.apache.jetspeed.aggregator.UnknownPortletDefinitionException;
  +import org.apache.jetspeed.components.portletregsitry.PortletRegistryComponent;
   import org.apache.jetspeed.container.PortletContainerFactory;
   import org.apache.jetspeed.cps.BaseCommonService;
   import org.apache.jetspeed.om.page.Fragment;
   import org.apache.jetspeed.request.RequestContext;
   import org.apache.jetspeed.entity.PortletEntityAccess;
  -import org.apache.jetspeed.registry.JetspeedPortletRegistry;
   import org.apache.jetspeed.util.JetspeedObjectID;
   import org.apache.pluto.PortletContainer;
   import org.apache.pluto.PortletContainerException;
  @@ -233,7 +234,8 @@
   
           if (portletEntity==null)
           {
  -            PortletDefinition portletDefinition = JetspeedPortletRegistry.getPortletDefinitionByUniqueName(fragment.getName());
  +			PortletRegistryComponent registry = (PortletRegistryComponent) Jetspeed.getComponentManager().getComponent(PortletRegistryComponent.class);
  +            PortletDefinition portletDefinition = registry.getPortletDefinitionByUniqueName(fragment.getName());
               if (portletDefinition == null)
               {
                   log.error("Failed to load: " + fragment.getName() + " from registry");
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message