You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2005/05/23 23:03:36 UTC

cvs commit: jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletregistry PersistenceBrokerPortletRegistry.java

ate         2005/05/23 14:03:36

  Modified:    portal/src/webapp/WEB-INF/assembly Tag: M3_preparation
                        jetspeed-spring.xml
               components/registry/src/java/org/apache/jetspeed/components/portletregistry
                        Tag: M3_preparation
                        PersistenceBrokerPortletRegistry.java
  Log:
  Missed the initialization of the static PortletFactory instance in PortletDefinitionImpl when I refactored the PortletFactory functionality quite some time ago.
  Finally fixing this.
  See: http://issues.apache.org/jira/browse/JS2-233
  Thanks to Peter Meier for bringing this up.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.46.2.1  +3 -4      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed-spring.xml
  
  Index: jetspeed-spring.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed-spring.xml,v
  retrieving revision 1.46
  retrieving revision 1.46.2.1
  diff -u -r1.46 -r1.46.2.1
  --- jetspeed-spring.xml	26 Apr 2005 23:31:50 -0000	1.46
  +++ jetspeed-spring.xml	23 May 2005 21:03:36 -0000	1.46.2.1
  @@ -134,10 +134,9 @@
       
     <!-- Portlet Registry DAO-->
     <bean id="portletRegistryImpl" class="org.apache.jetspeed.components.portletregistry.PersistenceBrokerPortletRegistry" init-method="init">
  -    	<constructor-arg>
  -    		<value>META-INF/registry_repository.xml</value>
  -    	</constructor-arg>
  -    </bean>
  +        <constructor-arg index="0"><value>META-INF/registry_repository.xml</value></constructor-arg>
  +        <constructor-arg index="1"><ref bean="portletFactory"/></constructor-arg>
  +  </bean>
   		    
   	<bean id="org.apache.jetspeed.components.portletregistry.PortletRegistry"
   		  name="portletRegistry"
  
  
  
  No                   revision
  No                   revision
  1.3.4.1   +4 -2      jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletregistry/PersistenceBrokerPortletRegistry.java
  
  Index: PersistenceBrokerPortletRegistry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletregistry/PersistenceBrokerPortletRegistry.java,v
  retrieving revision 1.3
  retrieving revision 1.3.4.1
  diff -u -r1.3 -r1.3.4.1
  --- PersistenceBrokerPortletRegistry.java	1 Feb 2005 16:59:20 -0000	1.3
  +++ PersistenceBrokerPortletRegistry.java	23 May 2005 21:03:36 -0000	1.3.4.1
  @@ -22,6 +22,7 @@
   import java.util.prefs.Preferences;
   
   import org.apache.jetspeed.components.dao.InitablePersistenceBrokerDaoSupport;
  +import org.apache.jetspeed.factory.PortletFactory;
   import org.apache.jetspeed.om.common.MutableLanguage;
   import org.apache.jetspeed.om.common.Support;
   import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
  @@ -61,10 +62,11 @@
       /**
        *  
        */
  -    public PersistenceBrokerPortletRegistry(String repositoryPath)
  +    public PersistenceBrokerPortletRegistry(String repositoryPath, PortletFactory portletFactory)
       {
           super(repositoryPath);
           PortletDefinitionImpl.setPortletRegistry(this);
  +        PortletDefinitionImpl.setPortletFactory(portletFactory);
       }
   
       public Language createLanguage( Locale locale, String title, String shortTitle, String description,
  
  
  

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