Author: jeff.yuchang Date: 2009-10-29 12:24:11 -0400 (Thu, 29 Oct 2009) New Revision: 213 Added: trunk/distribution/src/main/release/db/build.xml trunk/distribution/src/main/release/db/sql/ trunk/distribution/src/main/release/db/sql/mysql.drop.sql trunk/distribution/src/main/release/db/sql/postgres.drop.sql Modified: trunk/distribution/src/main/release/db/jdbc/mysql.properties trunk/qa/hudson-riftsaw-jboss.sh Log: * Add create and drop db schema through ANT script. * Also add drop sql for integration test. (Won't work at present, but won't impact the build though) Added: trunk/distribution/src/main/release/db/build.xml =================================================================== --- trunk/distribution/src/main/release/db/build.xml (rev 0) +++ trunk/distribution/src/main/release/db/build.xml 2009-10-29 16:24:11 UTC (rev 213) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="riftsaw.db.install"> + + <!-- DEFAULT PROPERTY VALUES --> + <property name="database" value="hsqldb" /> + + <property file="jdbc/${database}.properties" /> + + <!-- ### LOG PROPERTIES ################################################# --> + <target name="log.properties"> + <echo message="database....... ${database}" /> + <echo message="jdbc driver.... ${driver}" /> + <echo message="connection url....... ${connection.url}" /> + <echo message="username.. ${username}" /> + </target> + + <!-- ### CREATE RiftSaw SCHEMA ############################################# --> + <target name="create.riftsaw.schema" + depends="log.properties" + description="creates the riftsaw tables in the database"> + <sql driver="${driver}" + url="${connection.url}" + userid="${username}" + password="${password}" + onerror="continue" + src="../modules/riftsaw.sar/bpel-sql/bpel.${database}.sql"> + <classpath> + <fileset dir="drivers"> + <include name="*.jar"/> + </fileset> + </classpath> + </sql> + </target> + + <!-- ### DROP RiftSaw SCHEMA ############################################### --> + <target name="drop.riftsaw.schema" + depends="log.properties" + description="drops the riftsaw tables from the database"> + <sql driver="${driver}" + url="${connection.url}" + userid="${username}" + password="${password}" + onerror="continue" + src="sql/${database}.drop.sql"> + <classpath> + <fileset dir="drivers"> + <include name="*.jar"/> + </fileset> + </classpath> + </sql> + </target> + +</project> Modified: trunk/distribution/src/main/release/db/jdbc/mysql.properties =================================================================== --- trunk/distribution/src/main/release/db/jdbc/mysql.properties 2009-10-29 15:30:55 UTC (rev 212) +++ trunk/distribution/src/main/release/db/jdbc/mysql.properties 2009-10-29 16:24:11 UTC (rev 213) @@ -1,5 +1,5 @@ -connection.url=jdbc:mysql://localhost/riftsawdb?autoReconnect=true +connection.url=jdbc:mysql://localhost:3306/riftsaw?autoReconnect=true driver=com.mysql.jdbc.Driver -username=riftsaw -password=riftsaw +username=jeff +password=jeff dialect=org.hibernate.dialect.MySQLInnoDBDialect \ No newline at end of file Added: trunk/distribution/src/main/release/db/sql/mysql.drop.sql =================================================================== --- trunk/distribution/src/main/release/db/sql/mysql.drop.sql (rev 0) +++ trunk/distribution/src/main/release/db/sql/mysql.drop.sql 2009-10-29 16:24:11 UTC (rev 213) @@ -0,0 +1,30 @@ +drop table ODE_SCHEMA_VERSION; +drop table ODE_JOB; +drop table BPEL_ACTIVITY_RECOVERY; +drop table BPEL_CORRELATION_PROP; +drop table BPEL_CORRELATION_SET; +drop table BPEL_CORRELATOR; +drop table BPEL_CORRELATOR_MESSAGE_CKEY; +drop table BPEL_EVENT; +drop table BPEL_FAULT; +drop table BPEL_INSTANCE; +drop table BPEL_MESSAGE; +drop table BPEL_MESSAGE_EXCHANGE; +drop table BPEL_MEX_PROPS; +drop table BPEL_PLINK_VAL; +drop table BPEL_PROCESS; +drop table BPEL_SCOPE; +drop table BPEL_SELECTORS; +drop table BPEL_UNMATCHED; +drop table BPEL_XML_DATA; +drop table LARGE_DATA; +drop table VAR_PROPERTY; +drop table BPEL_RES_ROUTE; +drop table STORE_DU; +drop table STORE_PROCESS; +drop table STORE_PROCESS_PROP; +drop table STORE_VERSIONS; + + + + Added: trunk/distribution/src/main/release/db/sql/postgres.drop.sql =================================================================== --- trunk/distribution/src/main/release/db/sql/postgres.drop.sql (rev 0) +++ trunk/distribution/src/main/release/db/sql/postgres.drop.sql 2009-10-29 16:24:11 UTC (rev 213) @@ -0,0 +1,30 @@ +drop table ODE_SCHEMA_VERSION; +drop table ODE_JOB; +drop table BPEL_ACTIVITY_RECOVERY; +drop table BPEL_CORRELATION_PROP; +drop table BPEL_CORRELATION_SET; +drop table BPEL_CORRELATOR; +drop table BPEL_CORRELATOR_MESSAGE_CKEY; +drop table BPEL_EVENT; +drop table BPEL_FAULT; +drop table BPEL_INSTANCE; +drop table BPEL_MESSAGE; +drop table BPEL_MESSAGE_EXCHANGE; +drop table BPEL_MEX_PROPS; +drop table BPEL_PLINK_VAL; +drop table BPEL_PROCESS; +drop table BPEL_SCOPE; +drop table BPEL_SELECTORS; +drop table BPEL_UNMATCHED; +drop table BPEL_XML_DATA; +drop table LARGE_DATA; +drop table VAR_PROPERTY; +drop table BPEL_RES_ROUTE; +drop table STORE_DU; +drop table STORE_PROCESS; +drop table STORE_PROCESS_PROP; +drop table STORE_VERSIONS; + + + + Modified: trunk/qa/hudson-riftsaw-jboss.sh =================================================================== --- trunk/qa/hudson-riftsaw-jboss.sh 2009-10-29 15:30:55 UTC (rev 212) +++ trunk/qa/hudson-riftsaw-jboss.sh 2009-10-29 16:24:11 UTC (rev 213) @@ -5,8 +5,9 @@ MAVEN_OPTS="-Xms512M -Xmx1024M" RIFTSAW_PARENT_DIR="$WORKSPACE" JBOSS_VERSION="5.1.0.GA" +DATABASE="hsql" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE" echo ANT_PROPERTIES=${ANT_PROPERTIES} # firstly build the Riftsaw and run unit tests @@ -20,7 +21,6 @@ ant $ANT_PROPERTIES clean ant $ANT_PROPERTIES install.jbossesb -DATABASE="hsql" RIFTSAW_VERSION="2.0-SNAPSHOT" ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" ESB_CONFIG="default"