[jboss-svn-commits] JBL Code SVN: r15365 - in labs/jbossesb/trunk/product/services/jbossesb: src/main/resources/message-store-sql/postgresql and 2 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: kurt.stam at jboss.com
Date: 2007-09-25 12:41:01 -0400 (Tue, 25 Sep 2007)
New Revision: 15365

Added:
   labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/postgresql/drop_database.sql
Modified:
   labs/jbossesb/trunk/product/services/jbossesb/lib/ext/build-time/
   labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/postgresql/create_database.sql
   labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/persistence/tests/RedeliverUnitTest.java
   labs/jbossesb/trunk/product/services/jbossesb/src/test/resources/jbossesb-unittest-properties.xml
Log:
JBESB-1050 adding code to unittests to be able to run on postgres


Property changes on: labs/jbossesb/trunk/product/services/jbossesb/lib/ext/build-time
___________________________________________________________________
Name: svn:ignore
   + postgresql-8.2-506.jdbc3.jar


Modified: labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/postgresql/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/postgresql/create_database.sql	2007-09-25 16:02:30 UTC (rev 15364)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/postgresql/create_database.sql	2007-09-25 16:41:01 UTC (rev 15365)
@@ -2,10 +2,10 @@
 
 -- DROP DATABASE jbossesb;
 
-CREATE DATABASE jbossesb
-WITH OWNER = postgres
-ENCODING = 'SQL_ASCII'
-TABLESPACE = pg_default;
+--CREATE DATABASE jbossesb
+--WITH OWNER = postgres
+--ENCODING = 'SQL_ASCII'
+--TABLESPACE = pg_default;
 
 
 CREATE TABLE message

Added: labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/postgresql/drop_database.sql
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/postgresql/drop_database.sql	                        (rev 0)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/postgresql/drop_database.sql	2007-09-25 16:41:01 UTC (rev 15365)
@@ -0,0 +1 @@
+DROP table message;

Modified: labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/persistence/tests/RedeliverUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/persistence/tests/RedeliverUnitTest.java	2007-09-25 16:02:30 UTC (rev 15364)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/persistence/tests/RedeliverUnitTest.java	2007-09-25 16:41:01 UTC (rev 15365)
@@ -286,7 +286,21 @@
                 stmnt.execute(sqlDropCmd);
                 System.out.println("Creating the message store schema");
                 stmnt.execute(sqlCreateCmd);
+            } else if ("org.postgresql.Driver".equals(Configuration.getStoreDriver())) {
                 
+                String sqlCreateCmd    = TestEnvironmentUtil.readTextFile(new File(resourceDir.getCanonicalPath() + "/message-store-sql/postgresql/create_database.sql"));
+                String sqlDropCmd      = TestEnvironmentUtil.readTextFile(new File(resourceDir.getCanonicalPath() + "/message-store-sql/postgresql/drop_database.sql"));
+                
+                ConnectionManager mgr = ConnectionManagerFactory.getConnectionManager();
+                mgr.init();
+                Connection con = mgr.getConnection();
+                Statement stmnt = con.createStatement();
+                System.out.println("Dropping the schema if exist");
+                try {
+                    stmnt.execute(sqlDropCmd);
+                } catch (Exception e) {}
+                System.out.println("Creating the message store schema");
+                stmnt.execute(sqlCreateCmd);
             }
         } catch (Throwable e) {
             e.printStackTrace();

Modified: labs/jbossesb/trunk/product/services/jbossesb/src/test/resources/jbossesb-unittest-properties.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/test/resources/jbossesb-unittest-properties.xml	2007-09-25 16:02:30 UTC (rev 15364)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/test/resources/jbossesb-unittest-properties.xml	2007-09-25 16:41:01 UTC (rev 15365)
@@ -75,12 +75,18 @@
 		<property name="org.jboss.soa.esb.persistence.db.jdbc.driver" 		value="com.mysql.jdbc.Driver"/>
 		<property name="org.jboss.soa.esb.persistence.db.user" 				value="kstam"/>
 		 -->
+		<!--  postgres 
+		<property name="org.jboss.soa.esb.persistence.db.connection.url" 	value="jdbc:postgresql://localhost/jbossesb"/>
+		<property name="org.jboss.soa.esb.persistence.db.jdbc.driver" 		value="org.postgresql.Driver"/>
+		<property name="org.jboss.soa.esb.persistence.db.user" 				value="postgres"/>
+		<property name="org.jboss.soa.esb.persistence.db.pwd" 				value="postgres"/>	
+		-->
 		<!-- hsqldb -->
 		<property name="org.jboss.soa.esb.persistence.db.connection.url" 	value="jdbc:hsqldb:hsql://localhost:9001/jbossesb"/>
 		<property name="org.jboss.soa.esb.persistence.db.jdbc.driver" 		value="org.hsqldb.jdbcDriver"/>
 		<property name="org.jboss.soa.esb.persistence.db.user" 				value="sa"/>
-		 
-		<property name="org.jboss.soa.esb.persistence.db.pwd" 				value=""/>		
+		<property name="org.jboss.soa.esb.persistence.db.pwd" 				value=""/>	
+		
 		<property name="org.jboss.soa.esb.persistence.db.pool.initial.size"	value="2"/>
 		<property name="org.jboss.soa.esb.persistence.db.pool.min.size"		value="2"/>
 		<property name="org.jboss.soa.esb.persistence.db.pool.max.size"		value="5"/>