[jbpm-commits] JBoss JBPM SVN: r4299 - in jbpm4/trunk: modules/distro/src/main/resources/config-tool and 2 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-03-19 11:50:39 -0400 (Thu, 19 Mar 2009) New Revision: 4299 Modified: jbpm4/trunk/build.xml jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.execution.hbm.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.identity.hbm.xml Log: build fixes Modified: jbpm4/trunk/build.xml =================================================================== --- jbpm4/trunk/build.xml 2009-03-19 15:00:00 UTC (rev 4298) +++ jbpm4/trunk/build.xml 2009-03-19 15:50:39 UTC (rev 4299) @@ -165,10 +165,9 @@ </ant> </target> - <target name="db.create"> - <fail unless="database" message="property database must be specified. E.g. ant -Ddatabase=oracle db.create"/> - <exec dir="modules/db" executable="${mvn.executable}"> - <arg line="-Ddatabase=${database} clean install" /> + <target name="db.create.mysql"> + <exec executable="${mvn.executable}"> + <arg line=" -Ddatabase=mysql -DskipTests -Pdrop-tables -Pcreate-tables clean install" /> </exec> </target> Modified: jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml 2009-03-19 15:00:00 UTC (rev 4298) +++ jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml 2009-03-19 15:50:39 UTC (rev 4299) @@ -271,8 +271,8 @@ <target name="internal.mysql.mapping.updates" if="is.mysql"> <replace file="${config.files.dir}/jbpm.execution.hbm.xml"> - <replacetoken><![CDATA[name="blob" type="blob" column="BLOB_VALUE_"]]></replacetoken> - <replacevalue><![CDATA[name="blob" type="blob" sql-type="longblob" column="BLOB_VALUE_"]]></replacevalue> + <replacetoken><![CDATA[type="blob"><column name="BLOB_VALUE_" ]]></replacetoken> + <replacevalue><![CDATA[type="blob"><column name="BLOB_VALUE_" sql-type="longblob"]]></replacevalue> </replace> </target> Modified: jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.execution.hbm.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.execution.hbm.xml 2009-03-19 15:00:00 UTC (rev 4298) +++ jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.execution.hbm.xml 2009-03-19 15:50:39 UTC (rev 4299) @@ -203,7 +203,7 @@ <generator class="native" /> </id> <version name="dbversion" column="DBVERSION_" /> - <property name="blob" type="blob" column="BLOB_VALUE_" /> + <property name="blob" type="blob"><column name="BLOB_VALUE_" /></property> <property name="bytes" type="binary" column="BINARY_VALUE_"/> <property name="clob" type="clob" column="CLOB_VALUE_" /> <property name="text" type="text" column="TEXT_VALUE_"/> Modified: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.identity.hbm.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.identity.hbm.xml 2009-03-19 15:00:00 UTC (rev 4298) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.identity.hbm.xml 2009-03-19 15:50:39 UTC (rev 4299) @@ -10,7 +10,7 @@ </id> <version name="dbversion" column="DBVERSION_" /> - <property name="name" column="NAME_" /> + <property name="id" column="ID_" /> <property name="givenName" column="GIVENNAME_" /> <property name="familyName" column="FAMILYNAME_" /> </class> @@ -44,6 +44,7 @@ </id> <version name="dbversion" column="DBVERSION_" /> + <property name="id" column="ID_" /> <property name="name" column="NAME_" /> <property name="type" column="TYPE_" />