6:29 a.m.
Author: heiko.braun(a)jboss.com
Date: 2009-03-19 07:29:20 -0400 (Thu, 19 Mar 2009)
New Revision: 4293
Modified:
jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml
Log:
Schema export did not reference the build classpath
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
11:10:14 UTC (rev 4292)
+++ jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml 2009-03-19
11:29:20 UTC (rev 4293)
@@ -1,27 +1,27 @@
<project name="jbpm.config.tool"
default="create.configuration.files" basedir=".">
- <!-- input properties -->
+ <!-- input properties -->
<property file="build.properties" />
- <!-- derived properties -->
+ <!-- derived properties -->
<property name="resolved.dir" value="${tmp.dir}/resolved" />
<condition property="is.jpdl.included">
<equals arg1="${jpdl}" arg2="include" />
</condition>
-
+
<!-- condition property="is.identity.included">
- <equals arg1="${identity}" arg2="include" />
- </condition -->
-
+ <equals arg1="${identity}" arg2="include" />
+ </condition -->
+
<!-- public targets -->
- <target name="create.configuration.files"
- depends="internal.prepare"
- description="creates a full set of jbpm configuration files">
+ <target name="create.configuration.files"
+ depends="internal.prepare"
+ description="creates a full set of jbpm configuration files">
- <concat destfile="${config.files.dir}/jbpm.hibernate.cfg.xml">
+ <concat destfile="${config.files.dir}/jbpm.hibernate.cfg.xml">
<filelist dir="${resolved.dir}">
<file name="hibernate/cfg/part1.jbpm.hibernate.cfg.xml" />
<file name="hibernate/${connection.type}/${database}.xml"/>
@@ -52,7 +52,7 @@
<file name="jbpm/cfg/identity.service.${identity}.xml" />
<file name="jbpm/cfg/command.service.${deployment.type}.xml" />
<file name="jbpm/cfg/part2.jbpm.cfg.xml" />
- <!-- file name="jbpm/cfg/identity.session.factory.${identity}.xml" /
-->
+ <!-- file name="jbpm/cfg/identity.session.factory.${identity}.xml" /
-->
<file name="jbpm/cfg/jpdl.deployers.${jpdl}.xml" />
<file name="jbpm/cfg/part3.jbpm.cfg.xml" />
<file name="jbpm/cfg/hibernate.session.${hibernate.session}.xml"
/>
@@ -60,10 +60,10 @@
<file name="jbpm/cfg/part4.jbpm.cfg.xml" />
</filelist>
</concat>
- <copy todir="${config.files.dir}">
- <fileset dir="log">
- <include name="${log.cfg}" />
- </fileset>
+ <copy todir="${config.files.dir}">
+ <fileset dir="log">
+ <include name="${log.cfg}" />
+ </fileset>
</copy>
<concat destfile="${config.files.dir}/jbpm.wire.bindings.xml">
@@ -77,12 +77,12 @@
<antcall target="internal.jpdl.hibernate.mapping.files" />
<!-- antcall target="internal.identity.config.files" / -->
- <antcall target="internal.jdk.logging" />
-
- <echo>Created jbpm configuration files in ${config.files.dir}</echo>
+ <antcall target="internal.jdk.logging" />
+
+ <echo>Created jbpm configuration files in ${config.files.dir}</echo>
</target>
- <target name="create.remote.configuration"
+ <target name="create.remote.configuration"
depends="internal.prepare"
description="creates a jbpm.cfg.xml that connects to a remote
jboss">
<delete>
@@ -108,36 +108,38 @@
<echo>Created remote jbpm configuration files in
${config.files.dir}</echo>
</target>
- <target name="create.db.scripts"
- depends="create.configuration.files"
+ <target name="create.db.scripts"
+ depends="create.configuration.files"
description="create ddl scripts for creating the db">
-
+
<mkdir dir="${db.scripts.dir}" />
<taskdef name="schemaexport"
classname="org.hibernate.tool.hbm2ddl.SchemaExportTask">
<classpath>
<pathelement location="${config.files.dir}" />
- <fileset dir="${libs.dir}">
+ <pathelement path="${runtime_classpath}"/>
+ <pathelement path="${test_classpath}"/>
+ <!--fileset dir="${libs.dir}">
<include name="*.jar"/>
- </fileset>
+ </fileset-->
</classpath>
</taskdef>
- <schemaexport output="${db.scripts.dir}/jbpm.${database}.create.sql"
- create="yes"
- drop="no"
- config="${config.files.dir}/jbpm.hibernate.cfg.xml"
- text="yes"
- delimiter=";"
+ <schemaexport output="${db.scripts.dir}/jbpm.${database}.create.sql"
+ create="yes"
+ drop="no"
+ config="${config.files.dir}/jbpm.hibernate.cfg.xml"
+ text="yes"
+ delimiter=";"
quiet="yes" />
- <schemaexport output="${db.scripts.dir}/jbpm.${database}.drop.sql"
- create="no"
- drop="yes"
- config="${config.files.dir}/jbpm.hibernate.cfg.xml"
- text="yes"
- delimiter=";"
+ <schemaexport output="${db.scripts.dir}/jbpm.${database}.drop.sql"
+ create="no"
+ drop="yes"
+ config="${config.files.dir}/jbpm.hibernate.cfg.xml"
+ text="yes"
+ delimiter=";"
quiet="yes" />
</target>
@@ -149,40 +151,40 @@
<echo message="username: ${hibernate.connection.username}" />
<sql driver="${hibernate.connection.driver_class}"
- url="${hibernate.connection.url}"
- userid="${hibernate.connection.username}"
- password="${hibernate.connection.password}"
- onerror="continue">
+ url="${hibernate.connection.url}"
+ userid="${hibernate.connection.username}"
+ password="${hibernate.connection.password}"
+ onerror="continue">
<transaction src="${db.scripts.dir}/jbpm.${database}.create.sql"/>
- <classpath>
- <pathelement path="${runtime_classpath}"/>
- <pathelement path="${test_classpath}"/>
- </classpath>
-
+ <classpath>
+ <pathelement path="${runtime_classpath}"/>
+ <pathelement path="${test_classpath}"/>
+ </classpath>
+
<!--classpath>
<fileset dir="${libs.dir}">
<include name="*.jar"/>
</fileset>
</classpath-->
</sql>
- </target>
+ </target>
<target name="db.drop"
depends="create.db.scripts, internal.load.hibernate.properties"
description="drops the db tables in the database">
<sql driver="${hibernate.connection.driver_class}"
- url="${hibernate.connection.url}"
- userid="${hibernate.connection.username}"
- password="${hibernate.connection.password}"
- onerror="continue">
+ url="${hibernate.connection.url}"
+ userid="${hibernate.connection.username}"
+ password="${hibernate.connection.password}"
+ onerror="continue">
<transaction src="${db.scripts.dir}/jbpm.${database}.drop.sql"/>
<classpath>
- <pathelement path="${runtime_classpath}"/>
- <pathelement path="${test_classpath}"/>
- </classpath>
-
+ <pathelement path="${runtime_classpath}"/>
+ <pathelement path="${test_classpath}"/>
+ </classpath>
+
<!--classpath>
<fileset dir="${libs.dir}">
<include name="*.jar"/>
@@ -190,48 +192,48 @@
</classpath-->
</sql>
</target>
-
+
<target name="db.drop.create"
depends="db.drop, db.create"
description="drops and then creates the db tables in the
database">
- </target>
+ </target>
- <!-- internal targets -->
- <target name="internal.load.hibernate.properties">
- <copy file="${resolved.dir}/hibernate/jdbc/${database}.xml"
+ <!-- internal targets -->
+ <target name="internal.load.hibernate.properties">
+ <copy file="${resolved.dir}/hibernate/jdbc/${database}.xml"
tofile="${tmp.dir}/hibernate.properties" />
- <replace file="${tmp.dir}/hibernate.properties"
+ <replace file="${tmp.dir}/hibernate.properties"
value="">
<replacetoken><![CDATA[ <property
name="]]></replacetoken>
</replace>
- <replace file="${tmp.dir}/hibernate.properties"
- value="=">
+ <replace file="${tmp.dir}/hibernate.properties"
+ value="=">
<replacetoken><![CDATA[">]]></replacetoken>
- </replace>
- <replace file="${tmp.dir}/hibernate.properties"
+ </replace>
+ <replace file="${tmp.dir}/hibernate.properties"
value="">
- <replacetoken><![CDATA[</property>]]></replacetoken>
+ <replacetoken><![CDATA[</property>]]></replacetoken>
</replace>
<property file="${tmp.dir}/hibernate.properties" />
- </target>
+ </target>
- <!--
+ <!--
<target name="internal.identity.config.files"
if="is.identity.included">
<mkdir dir="${tmp.dir}/identity" />
<mkdir dir="${config.files.dir}/META-INF" />
<copy file="hibernate/${connection.type}/${database}.xml"
tofile="${tmp.dir}/identity/identity.persistence.properties.xml"
overwrite="true"/>
- <replace file="${tmp.dir}/identity/identity.persistence.properties.xml"
- token="">"
- value="" value="" />
<replace file="${tmp.dir}/identity/identity.persistence.properties.xml"
+ token="">"
+ value="" value="" />
+ <replace file="${tmp.dir}/identity/identity.persistence.properties.xml"
token="</property>"
value="" />" />
- <copy todir="${tmp.dir}/identity">
- <fileset dir="identity/META-INF" />
- </copy>
+ <copy todir="${tmp.dir}/identity">
+ <fileset dir="identity/META-INF" />
+ </copy>
<concat destfile="${config.files.dir}/META-INF/persistence.xml">
<filelist dir="${tmp.dir}/identity">
<file name="part1.persistence.xml" />
@@ -255,8 +257,8 @@
</target>
<target name="internal.jdk.logging"
if="is.jdk.logging.included">
- <copy todir="${config.files.dir}">
- <fileset dir="jdk" />
+ <copy todir="${config.files.dir}">
+ <fileset dir="jdk" />
</copy>
</target>
@@ -264,19 +266,19 @@
<delete dir="${tmp.dir}" />
<mkdir dir="${config.files.dir}" />
<mkdir dir="${resolved.dir}" />
- <copy todir="${tmp.dir}"
+ <copy todir="${tmp.dir}"
file="jdbc.properties"
failonerror="false"
overwrite="true" />
- <copy todir="${tmp.dir}"
- file="${user.home}/.jbpm4/jdbc.properties"
+ <copy todir="${tmp.dir}"
+ file="${user.home}/.jbpm4/jdbc.properties"
failonerror="false"
overwrite="true" />
<copy todir="${resolved.dir}" filtering="true">
<fileset dir="." />
- <filterset filtersfile="${tmp.dir}/jdbc.properties">
- <filter token="jboss.bind.address"
value="${jboss.bind.address}"/>
- <filter token="jdbc.hsqldb.url" value="${jdbc.hsqldb.url}"
/>
+ <filterset filtersfile="${tmp.dir}/jdbc.properties">
+ <filter token="jboss.bind.address"
value="${jboss.bind.address}"/>
+ <filter token="jdbc.hsqldb.url" value="${jdbc.hsqldb.url}"
/>
</filterset>
</copy>
</target>