Author: jeff.yuchang Date: 2009-11-17 05:35:51 -0500 (Tue, 17 Nov 2009) New Revision: 272 Modified: trunk/integration-tests/build.xml trunk/integration-tests/pom.xml trunk/qa/build.xml trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/DatabaseInitializerMBean.java Log: * update the integration/build.xml to copy ojdbc only for oracle. Modified: trunk/integration-tests/build.xml =================================================================== --- trunk/integration-tests/build.xml 2009-11-17 10:33:49 UTC (rev 271) +++ trunk/integration-tests/build.xml 2009-11-17 10:35:51 UTC (rev 272) @@ -5,16 +5,20 @@ <property file="${riftsaw.test.deployment.properties}" /> + <condition property="is.ojdbc.available"> + <available file="${basedir}/../distribution/target/libs/ojdbc14.jar" /> + </condition> + + <target name="copy.ojdbc" if="is.ojdbc.available"> + <copy file="${basedir}/../distribution/target/libs/ojdbc14.jar" + todir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/db/drivers"/> + </target> + <target name="unpack-distribution"> <mkdir dir="${basedir}/../distribution/target/dist"/> <unzip dest="${basedir}/../distribution/target/dist" src="${basedir}/../distribution/target/riftsaw-${riftsaw.engine.version}.zip"/> - <!--copy file="${riftsaw.test.deployment.properties}" - tofile="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/install/deployment.properties" /--> - <!-- - <copy file="${basedir}/../distribution/target/libs/ojdbc14.jar" - todir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/db/drivers"/> - --> + <antcall target="copy.ojdbc" /> </target> <target name="deploy-riftsaw" > Modified: trunk/integration-tests/pom.xml =================================================================== --- trunk/integration-tests/pom.xml 2009-11-17 10:33:49 UTC (rev 271) +++ trunk/integration-tests/pom.xml 2009-11-17 10:35:51 UTC (rev 272) @@ -182,12 +182,6 @@ <target name="package-tests" /> </ant> - <!-- Cleanup test environment in case of previous failure --> - <!-- - <ant antfile="${basedir}/build.xml"> - <target name="undeploy-riftsaw" /> - </ant> - --> <ant antfile="${basedir}/build.xml"> <target name="deploy-riftsaw" /> </ant> Modified: trunk/qa/build.xml =================================================================== --- trunk/qa/build.xml 2009-11-17 10:33:49 UTC (rev 271) +++ trunk/qa/build.xml 2009-11-17 10:35:51 UTC (rev 272) @@ -2,7 +2,7 @@ <project name="riftsaw.qa"> - <!-- QA SPECIFIC CONFIGURATIONS --> + <!-- SPECIFIC CONFIGURATIONS --> <property file="build.properties" /> <fail message="property riftsaw.parent.dir must be specified" unless="riftsaw.parent.dir" /> @@ -129,4 +129,28 @@ <property name="database" value="${database}" /> </ant> </target> + + <target name="stop-server" > + <echo>Stopping the server</echo> + <echo>Server is at ${org.jboss.as.home}</echo> + + <java classname="org.jboss.Shutdown" fork="true" failonerror="false" resultproperty="shutdown.rc"> + <arg line="-s jnp://localhost:1099 --shutdown"/> + <classpath> + <pathelement path="${org.jboss.as.home}/bin/shutdown.jar"/> + <pathelement path="${org.jboss.as.home}/client/jbossall-client.jar"/> + <pathelement path="${JAVA_HOME}/lib/tools.jar"/> + </classpath> + </java> + <echo>Shutdown rc = ${shutdown.rc}</echo> + <condition property="shutdown.okay"> + <equals arg1="${shutdown.rc}" arg2="0"/> + </condition> + <echo>Waiting for JNP to stop listening...</echo> + <waitfor maxwait="2" maxwaitunit="minute"> + <not> + <socket server="localhost" port="1099"/> + </not> + </waitfor> + </target> </project> Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/DatabaseInitializerMBean.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/DatabaseInitializerMBean.java 2009-11-17 10:33:49 UTC (rev 271) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/DatabaseInitializerMBean.java 2009-11-17 10:35:51 UTC (rev 272) @@ -31,25 +31,19 @@ */ public interface DatabaseInitializerMBean extends ServiceMBean { - String getExistsSql() - ; + String getExistsSql(); - void setExistsSql(String existsSql) - ; + void setExistsSql(String existsSql); boolean getUseEOL() ; void setUseEOL(boolean useEOL) ; - String getSqlFiles() - ; + String getSqlFiles(); - void setSqlFiles(String sqlFiles) - ; + void setSqlFiles(String sqlFiles); - String getDatasource() - ; + String getDatasource(); - void setDatasource(String datasource) - ; + void setDatasource(String datasource); }