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

[Christian Bauer]

  User: cbauer  
  Date: 08/01/03 09:54:34

  Modified:    examples/wiki/src/etc   wiki-test-ds.xml wiki-dev-ds.xml
  Log:
  Dev profile now requires MySQL, disabled tests conditionally that don't run on HSQL
  
  Revision  Changes    Path
  1.6       +1 -2      jboss-seam/examples/wiki/src/etc/wiki-test-ds.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: wiki-test-ds.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/wiki-test-ds.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- wiki-test-ds.xml	19 Dec 2007 04:29:21 -0000	1.5
  +++ wiki-test-ds.xml	3 Jan 2008 14:54:34 -0000	1.6
  @@ -24,8 +24,7 @@
       </local-tx-datasource>
       -->
   
  -    <!--
  -    MySQL also requires changes to persistence-test.xml and DBUnitSeamTest.java (foreign key checks)
  +    <!-- MySQL also requires changes to persistence-test.xml and AllTests.tng.xml
       <local-tx-datasource>
           <jndi-name>wikiTestDatasource</jndi-name>
           <connection-url>jdbc:mysql://localhost/test?characterEncoding=UTF-8</connection-url>
  
  
  
  1.6       +10 -0     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.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- wiki-dev-ds.xml	25 Sep 2007 14:30:45 -0000	1.5
  +++ wiki-dev-ds.xml	3 Jan 2008 14:54:34 -0000	1.6
  @@ -1,6 +1,7 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <datasources>
   
  +    <!-- TODO: Queries are getting too complex for HSQL DB, see ForumQueries.hbm.xml
       <local-tx-datasource>
           <jndi-name>wikiDatasource</jndi-name>
           <connection-url>jdbc:hsqldb:hsql://localhost:9001</connection-url>
  @@ -8,5 +9,14 @@
           <user-name>sa</user-name>
           <password></password>
       </local-tx-datasource>
  +    -->
  +
  +    <local-tx-datasource>
  +        <jndi-name>wikiDatasource</jndi-name>
  +        <connection-url>jdbc:mysql://localhost/test?characterEncoding=UTF-8</connection-url>
  +        <driver-class>com.mysql.jdbc.Driver</driver-class>
  +        <user-name>test</user-name>
  +        <password></password>
  +    </local-tx-datasource>
   
   </datasources>