[jboss-cvs] jboss-seam/examples/wiki/src/etc ...

[Christian Bauer]

  User: cbauer  
  Date: 07/09/25 10:30:45

  Modified:    examples/wiki/src/etc   wiki-dev-ds.xml wiki-prod-ds.xml
  Log:
  Recommending upgrade of JBoss-bundled Hibernate instead of deploying our own (which caused weird conflicts at runtime)
  
  Revision  Changes    Path
  1.5       +0 -6      jboss-seam/examples/wiki/src/etc/wiki-dev-ds.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: wiki-dev-ds.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/wiki-dev-ds.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- wiki-dev-ds.xml	9 Jul 2007 16:37:40 -0000	1.4
  +++ wiki-dev-ds.xml	25 Sep 2007 14:30:45 -0000	1.5
  @@ -7,12 +7,6 @@
           <driver-class>org.hsqldb.jdbcDriver</driver-class>
           <user-name>sa</user-name>
           <password></password>
  -
  -        <!-- This means it will be bound under "wikiDatasource", not "java:/wikiDatasource".
  -             Apparently this enables remote datasources, which I don't need. However, my
  -             local Hibernate in the WAR won't find the datasource if this setting is not present. -->
  -        <use-java-context>false</use-java-context>
  -
       </local-tx-datasource>
   
   </datasources>
  
  
  
  1.6       +11 -7     jboss-seam/examples/wiki/src/etc/wiki-prod-ds.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: wiki-prod-ds.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/wiki-prod-ds.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- wiki-prod-ds.xml	24 Sep 2007 08:23:24 -0000	1.5
  +++ wiki-prod-ds.xml	25 Sep 2007 14:30:45 -0000	1.6
  @@ -8,15 +8,19 @@
           <user-name>test</user-name>
           <password></password>
   
  -        <!-- This means it will be bound under "wikiDatasource", not "java:/wikiDatasource".
  -             Apparently this enables remote datasources, which I don't need. However, my
  -             local Hibernate in the WAR won't find the datasource if this setting is not present. -->
  -        <use-java-context>false</use-java-context>
  -
           <min-pool-size>20</min-pool-size>
  -        <max-pool-size>50</max-pool-size>
  +
  +        <!-- Make sure your MySQL config has that man max_connections!
  +             This is the max_threads in default Tomcat server.xml on JBoss AS. -->
  +        <max-pool-size>250</max-pool-size>
  +
           <blocking-timeout-millis>5000</blocking-timeout-millis>
  -        <idle-timeout-minutes>10</idle-timeout-minutes>
  +        
  +        <!-- Needs to be smaller than wait_timeout (which is in seconds) in /etc/my.cnf! -->
  +        <idle-timeout-minutes>2</idle-timeout-minutes>
  +
  +        <!-- Safety in case all these timeouts still conflict -->
  +        <check-valid-connection-sql>select 1</check-valid-connection-sql>
   
       </local-tx-datasource>