[jboss-cvs] jboss-portal/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance ...

[Julien Viet]

  User: julien  
  Date: 06/07/30 08:36:22

  Modified:    core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance 
                        jboss-beans.xml
  Log:
  JBPORTAL-973 : Portlet instance container integration testing
  JBPORTAL-972 : Portlet stateful invoker testing
  
  Revision  Changes    Path
  1.3       +17 -18    jboss-portal/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/jboss-beans.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: jboss-beans.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/jboss-beans.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- jboss-beans.xml	1 May 2006 20:44:31 -0000	1.2
  +++ jboss-beans.xml	30 Jul 2006 12:36:22 -0000	1.3
  @@ -30,40 +30,40 @@
         <property name="password"><inject bean="DataSourceConfig" property="password"/></property>
      </bean>
   
  -   <bean name="HibernateSupport" class="org.jboss.portal.test.framework.embedded.HibernateSupport">
  +   <bean name="InstanceHibernateSupport" class="org.jboss.portal.test.framework.embedded.HibernateSupport">
         <property name="mappings">
            <list elementClass="java.lang.String">
               <value>conf/hibernate/instance/domain.hbm.xml</value>
  -            <value>conf/hibernate/portlet/domain.hbm.xml</value>
            </list>
         </property>
  -      <property name="jNDIName">java:/SessionFactory</property>
  -   </bean>
  -
  -   <bean name="AuthorizationDomainRegistry" class="org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl">
  +      <property name="jNDIName">java:/InstanceSessionFactory</property>
      </bean>
   
  -   <bean name="AuthorizationManagerFactory" class="org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory">
  -      <property name="authorizationDomainRegistry"><inject bean="AuthorizationDomainRegistry"/></property>
  +   <bean name="PortletHibernateSupport" class="org.jboss.portal.test.framework.embedded.HibernateSupport">
  +      <property name="mappings">
  +         <list elementClass="java.lang.String">
  +            <value>conf/hibernate/portlet/domain.hbm.xml</value>
  +         </list>
  +      </property>
  +      <property name="jNDIName">java:/PortletSessionFactory</property>
      </bean>
   
      <bean name="StateStore" class="org.jboss.portal.core.impl.portlet.state.PersistentStateStore">
  -      <property name="sessionFactoryJNDIName">java:/SessionFactory</property>
  +      <property name="sessionFactoryJNDIName">java:/PortletSessionFactory</property>
      </bean>
   
  -   <bean name="MockPortletInvoker" class="org.jboss.portal.test.core.model.instance.MockPortletInvoker">
  +   <bean name="NextPortletInvoker" class="org.jboss.portal.portlet.test.support.PortletInvokerSupport">
      </bean>
   
      <bean name="StatefulPortletInvoker" class="org.jboss.portal.portlet.state.producer.StatefulPortletInvoker">
         <property name="stateStore"><inject bean="StateStore"/></property>
  -      <property name="portletInvoker"><inject bean="MockPortletInvoker"/></property>
  +      <property name="portletInvoker"><inject bean="NextPortletInvoker"/></property>
      </bean>
   
      <bean name="InstanceContainer" class="org.jboss.portal.core.impl.model.instance.PersistentInstanceContainer">
  -      <property name="authorizationDomainRegistry"><inject bean="AuthorizationDomainRegistry"/></property>
  -      <property name="portalAuthorizationManagerFactory"><inject bean="AuthorizationManagerFactory"/></property>
  +      <property name="cloneOnCreate">false</property>
         <property name="portletInvoker"><inject bean="StatefulPortletInvoker"/></property>
  -      <property name="sessionFactoryJNDIName">java:/SessionFactory</property>
  +      <property name="sessionFactoryJNDIName">java:/InstanceSessionFactory</property>
      </bean>
   
      <bean name="TestBean" class="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase">
  @@ -71,12 +71,11 @@
            <factory bean="BeanFactory"/>
            <parameter>TestBean</parameter>
         </constructor>
  -      <property name="hibernate"><inject bean="HibernateSupport"/></property>
  +      <property name="instanceHibernateSupport"><inject bean="InstanceHibernateSupport"/></property>
  +      <property name="portletHibernateSupport"><inject bean="PortletHibernateSupport"/></property>
         <property name="instanceContainer"><inject bean="InstanceContainer"/></property>
         <property name="stateStore"><inject bean="StateStore"/></property>
  -      <property name="authorizationDomainRegistry"><inject bean="AuthorizationDomainRegistry"/></property>
  -      <property name="authorizationManagerFactory"><inject bean="AuthorizationManagerFactory"/></property>
         <property name="statefulPortletInvoker"><inject bean="StatefulPortletInvoker"/></property>
  -      <property name="mockPortletInvoker"><inject bean="MockPortletInvoker"/></property>
  +      <property name="nextPortletInvoker"><inject bean="NextPortletInvoker"/></property>
      </bean>
   </deployment>