[jboss-cvs] jboss-seam/examples/hibernate2/resources/tomcat ...

[Michael Yuan]

  User: myuan   
  Date: 06/11/17 16:40:58

  Modified:    examples/hibernate2/resources/tomcat  jboss-beans.xml
  Log:
  Improved MC support
  
  Revision  Changes    Path
  1.2       +30 -54    jboss-seam/examples/hibernate2/resources/tomcat/jboss-beans.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: jboss-beans.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/hibernate2/resources/tomcat/jboss-beans.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- jboss-beans.xml	8 Nov 2006 10:01:02 -0000	1.1
  +++ jboss-beans.xml	17 Nov 2006 21:40:58 -0000	1.2
  @@ -6,55 +6,31 @@
                 
      <bean name="Naming" class="org.jnp.server.SingletonNamingServer"/>
    
  -   <bean name="TransactionManagerFactory" class="org.jboss.seam.microcontainer.TransactionManagerFactory"/>
  +  <bean name="TransactionManagerFactory" 
  +    class="org.jboss.seam.microcontainer.TransactionManagerFactory"/>
      <bean name="TransactionManager" class="java.lang.Object">
         <constructor factoryMethod="getTransactionManager">
            <factory bean="TransactionManagerFactory"/>
         </constructor>
      </bean>
      
  -   <bean name="InitialContextProperties" class="java.util.Hashtable">
  -      <constructor>
  -      <parameter class="java.util.Map">
  -            <map keyClass="java.lang.String" valueClass="java.lang.String">
  -               <entry>
  -                  <key>java.naming.factory.initial</key>
  -                  <value>org.jnp.interfaces.LocalOnlyContextFactory</value>
  -               </entry>
  -               <entry>
  -                   <key>java.naming.factory.url.pkgs</key>
  -                   <value>org.jboss.naming:org.jnp.interfaces</value>
  -               </entry>
  -            </map>
  -      </parameter>
  -      </constructor>
  -   </bean>
  -   
  -   <bean name="CachedConnectionManager" 
  -         class="org.jboss.resource.connectionmanager.CachedConnectionManagerReference">
  -      <property name="transactionManager">
  -        <inject bean="TransactionManager"/>
  -      </property>
  -   </bean>
  -   
  -   
  -   <bean name="DefaultDSBootstrap" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
  +  <bean name="bookingDatasourceFactory" 
  +       class="org.jboss.seam.microcontainer.DataSourceFactory">
         <property name="driverClass">org.hsqldb.jdbcDriver</property>
  -      <property name="connectionURL">jdbc:hsqldb:.</property>
  +    <property name="connectionUrl">jdbc:hsqldb:.</property>
         <property name="userName">sa</property>
         <property name="jndiName">java:/DefaultDS</property>
         <property name="minSize">0</property>
         <property name="maxSize">10</property>
         <property name="blockingTimeout">1000</property>
         <property name="idleTimeout">100000</property>
  -      <property name="transactionManager"><inject bean="TransactionManager"/></property>
  -      <property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property>
  -      <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
  +    <property name="transactionManager">
  +      <inject bean="TransactionManager"/>
  +    </property>
      </bean>
  -   
  -   <bean name="DefaultDS" class="java.lang.Object">
  -      <constructor factoryMethod="getDatasource">
  -         <factory bean="DefaultDSBootstrap"/>
  +  <bean name="bookingDatasource" class="java.lang.Object">
  +    <constructor factoryMethod="getDataSource">
  +      <factory bean="bookingDatasourceFactory"/>
         </constructor>
      </bean>