[jbpm-commits] JBoss JBPM SVN: r4812 - in jbpm4/trunk: modules/distro/src/main/files/jboss and 5 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-05-14 09:36:10 -0400 (Thu, 14 May 2009) New Revision: 4812 Added: jbpm4/trunk/qa/jdbc/ jbpm4/trunk/qa/jdbc/hsqldb.properties jbpm4/trunk/qa/jdbc/mysql.properties jbpm4/trunk/qa/jdbc/oracle.properties jbpm4/trunk/qa/jdbc/postgresql.properties jbpm4/trunk/qa/jdbc/sybase.properties Removed: jbpm4/trunk/qa/db/ Modified: jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/oracle.hibernate.cfg.xml jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml jbpm4/trunk/modules/examples/pom.xml jbpm4/trunk/modules/test-db/pom.xml jbpm4/trunk/qa/build.xml Log: JBPM-2150 updated oracle dialect to 9i and reestablished local database testing capability with 'mvn -Ddatabase=oracle clean test' on modules examples and test-db Modified: jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/oracle.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/oracle.hibernate.cfg.xml 2009-05-14 13:10:14 UTC (rev 4811) +++ jbpm4/trunk/modules/distro/src/main/files/db/hibernate.cfg/oracle.hibernate.cfg.xml 2009-05-14 13:36:10 UTC (rev 4812) @@ -7,7 +7,7 @@ <hibernate-configuration> <session-factory> - <property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property> + <property name="hibernate.dialect">org.hibernate.dialect.Oracle9iDialect</property> <property name=&quot;hibernate.connection.driver_class&quot;&gt;@jdbc.driver(a)&lt;/property&gt; <property name=&quot;hibernate.connection.url&quot;&gt;@jdbc.url(a)&lt;/property&gt; <property name=&quot;hibernate.connection.username&quot;&gt;@jdbc.username(a)&lt;/property&gt; Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-05-14 13:10:14 UTC (rev 4811) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-05-14 13:36:10 UTC (rev 4812) @@ -7,7 +7,7 @@ <!-- JDBC PROPERTIES --> <property file="${user.home}/jdbc/${database}.properties" /> - <property file="${jbpm.home}/jdbc/${database}.properties" /> + <property file="${jbpm.home}/db/jdbc/${database}.properties" /> <!-- DEFAULT PROPERTY VALUES --> <property name="database" value="hsqldb" /> Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml 2009-05-14 13:10:14 UTC (rev 4811) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml 2009-05-14 13:36:10 UTC (rev 4812) @@ -7,7 +7,7 @@ <hibernate-configuration> <session-factory> - <property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property> + <property name="hibernate.dialect">org.hibernate.dialect.Oracle9iDialect</property> <property name="hibernate.connection.datasource">java:JbpmDS</property> <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> Modified: jbpm4/trunk/modules/examples/pom.xml =================================================================== --- jbpm4/trunk/modules/examples/pom.xml 2009-05-14 13:10:14 UTC (rev 4811) +++ jbpm4/trunk/modules/examples/pom.xml 2009-05-14 13:36:10 UTC (rev 4812) @@ -98,12 +98,24 @@ </goals> <configuration> <tasks> - <copy todir="target/test-classes" overwrite="true" failonerror="false"> - <fileset dir="../../qa/db/${database}" /> + <copy file="../../qa/jdbc/${database}.properties" + tofile="target/jdbc.properties" /> + <copy file="${user.home}/.jbpm4/jdbc/${database}.properties" + tofile="target/jdbc.properties" + overwrite="true" + failonerror="true "/> + <copy file="../../modules/distro/src/main/files/db/hibernate.cfg/${database}.hibernate.cfg.xml" + tofile="target/test-classes/jbpm.hibernate.cfg.xml" + overwrite="true"> + <filterset> + <filtersfile file="target/jdbc.properties" /> + </filterset> </copy> - <copy todir="target/test-classes" overwrite="true" failonerror="false"> - <fileset dir="${user.home}/.jbpm4/qa/db/${database}" /> - </copy> + <replace file="target/test-classes/jbpm.hibernate.cfg.xml"> + <replacetoken><![CDATA[<property name="hibernate.format_sql">true</property>]]></replacetoken> + <replacevalue><![CDATA[<property name="hibernate.format_sql">true</property> + <property name="hibernate.hbm2ddl.auto">create-drop</property>]]></replacevalue> + </replace> </tasks> </configuration> </execution> @@ -160,7 +172,7 @@ <fileset dir="../distro/src/main/files/jboss/jbpm.cfg.remote.client" /> </copy> <copy todir="target/test-classes" overwrite="true" failonerror="false"> - <fileset dir="${user.home}/.jbpm4/qa/jbpm.cfg.remote.client" /> + <fileset dir="${user.home}/.jbpm4/jbpm.cfg.remote.client" /> </copy> </tasks> </configuration> Modified: jbpm4/trunk/modules/test-db/pom.xml =================================================================== --- jbpm4/trunk/modules/test-db/pom.xml 2009-05-14 13:10:14 UTC (rev 4811) +++ jbpm4/trunk/modules/test-db/pom.xml 2009-05-14 13:36:10 UTC (rev 4812) @@ -72,12 +72,24 @@ </goals> <configuration> <tasks> - <copy todir="target/test-classes" overwrite="true" failonerror="false"> - <fileset dir="../../qa/db/${database}" /> + <copy file="../../qa/jdbc/${database}.properties" + tofile="target/jdbc.properties" /> + <copy file="${user.home}/.jbpm4/jdbc/${database}.properties" + tofile="target/jdbc.properties" + overwrite="true" + failonerror="true "/> + <copy file="../../modules/distro/src/main/files/db/hibernate.cfg/${database}.hibernate.cfg.xml" + tofile="target/test-classes/jbpm.hibernate.cfg.xml" + overwrite="true"> + <filterset> + <filtersfile file="target/jdbc.properties" /> + </filterset> </copy> - <copy todir="target/test-classes" overwrite="true" failonerror="false"> - <fileset dir="${user.home}/.jbpm4/qa/db/${database}" /> - </copy> + <replace file="target/test-classes/jbpm.hibernate.cfg.xml"> + <replacetoken><![CDATA[<property name="hibernate.format_sql">true</property>]]></replacetoken> + <replacevalue><![CDATA[<property name="hibernate.format_sql">true</property> + <property name="hibernate.hbm2ddl.auto">create-drop</property>]]></replacevalue> + </replace> </tasks> </configuration> </execution> Modified: jbpm4/trunk/qa/build.xml =================================================================== --- jbpm4/trunk/qa/build.xml 2009-05-14 13:10:14 UTC (rev 4811) +++ jbpm4/trunk/qa/build.xml 2009-05-14 13:36:10 UTC (rev 4812) @@ -56,12 +56,12 @@ <target name="post.install"> <!-- overwrite the default jdbc properties in the distro with those specified in the qa jdbc directory --> - <copy file="db/${database}.properties" + <copy file="jdbc/${database}.properties" todir="${jbpm.home}/db/jdbc" overwrite="true" failonerror="false" /> <!-- overwrite the jdbc properties in the distro with those specified in the user specific properties --> - <copy file="${user.home}/.jbpm4/db/${database}.properties" + <copy file="${user.home}/.jbpm4/jdbc/${database}.properties" todir="${jbpm.home}/db/jdbc" overwrite="true" failonerror="false" /> Added: jbpm4/trunk/qa/jdbc/hsqldb.properties =================================================================== --- jbpm4/trunk/qa/jdbc/hsqldb.properties (rev 0) +++ jbpm4/trunk/qa/jdbc/hsqldb.properties 2009-05-14 13:36:10 UTC (rev 4812) @@ -0,0 +1,4 @@ +jdbc.driver=org.hsqldb.jdbcDriver +jdbc.url=jdbc:hsqldb:hsql://localhost:1701 +jdbc.username=sa +jdbc.password= Property changes on: jbpm4/trunk/qa/jdbc/hsqldb.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/qa/jdbc/mysql.properties =================================================================== --- jbpm4/trunk/qa/jdbc/mysql.properties (rev 0) +++ jbpm4/trunk/qa/jdbc/mysql.properties 2009-05-14 13:36:10 UTC (rev 4812) @@ -0,0 +1,4 @@ +jdbc.driver=com.mysql.jdbc.Driver +jdbc.url=jdbc:mysql://dev02.qa.atl.jboss.com:3306/pvm1 +jdbc.username=pvm1 +jdbc.password=pvm1 Property changes on: jbpm4/trunk/qa/jdbc/mysql.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/qa/jdbc/oracle.properties =================================================================== --- jbpm4/trunk/qa/jdbc/oracle.properties (rev 0) +++ jbpm4/trunk/qa/jdbc/oracle.properties 2009-05-14 13:36:10 UTC (rev 4812) @@ -0,0 +1,4 @@ +jdbc.driver=oracle.jdbc.driver.OracleDriver +jdbc.url=jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01 +jdbc.username=PVM3 +jdbc.password=PVM3 Property changes on: jbpm4/trunk/qa/jdbc/oracle.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/qa/jdbc/postgresql.properties =================================================================== --- jbpm4/trunk/qa/jdbc/postgresql.properties (rev 0) +++ jbpm4/trunk/qa/jdbc/postgresql.properties 2009-05-14 13:36:10 UTC (rev 4812) @@ -0,0 +1,7 @@ +jdbc.driver=org.postgresql.Driver +jdbc.port=5432 +jdbc.server=dev01.qa.atl.jboss.com +jdbc.databasename=pvm3 +jdbc.url=jdbc:postgresql://dev01.qa.atl.jboss.com:5432/pvm3 +jdbc.username=pvm3 +jdbc.password=pvm3 Property changes on: jbpm4/trunk/qa/jdbc/postgresql.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/qa/jdbc/sybase.properties =================================================================== --- jbpm4/trunk/qa/jdbc/sybase.properties (rev 0) +++ jbpm4/trunk/qa/jdbc/sybase.properties 2009-05-14 13:36:10 UTC (rev 4812) @@ -0,0 +1,5 @@ +jdbc.driver=net.sourceforge.jtds.jdbc.Driver +# jdbc.driver=com.sybase.jdbc3.jdbc.SybDriver +jdbc.url=jdbc:sybase:Tds:localhost:5000/jbpmdb +jdbc.username=jbpm +jdbc.password=jbpm Property changes on: jbpm4/trunk/qa/jdbc/sybase.properties ___________________________________________________________________ Name: svn:mime-type + text/plain