Author: tom.baeyens(a)jboss.com Date: 2009-03-13 19:01:22 -0400 (Fri, 13 Mar 2009) New Revision: 4242 Modified: jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties jbpm4/branches/tbaeyens/modules/distro/pom.xml jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties Log: work Modified: jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties 2009-03-13 21:58:53 UTC (rev 4241) +++ jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties 2009-03-13 23:01:22 UTC (rev 4242) @@ -1,2 +1,2 @@ ## index of importer -> set(imports) -#Fri Mar 13 17:58:37 CET 2009 +#Fri Mar 13 22:58:08 CET 2009 Modified: jbpm4/branches/tbaeyens/modules/distro/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/pom.xml 2009-03-13 21:58:53 UTC (rev 4241) +++ jbpm4/branches/tbaeyens/modules/distro/pom.xml 2009-03-13 23:01:22 UTC (rev 4242) @@ -187,6 +187,8 @@ <property name="product.short.name" value="${artifactId}" /> <property name="product.version" value="${project.version}" /> <property name="user.home" value="${user.home}" /> + <property name="user.dir" value="${user.dir}" /> + <ant antfile="scripts/antrun-installer.xml" target="build-installer" /> </tasks> </configuration> Modified: jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml 2009-03-13 21:58:53 UTC (rev 4241) +++ jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml 2009-03-13 23:01:22 UTC (rev 4242) @@ -35,12 +35,15 @@ <mkdir dir="${deploy.artifacts.dir}/resources/hsqldb" /> <echo message="creating hsqldb db" /> - <ant antfile="build.xml" + + <echo message="USER DIR: ${user.dir}/target/db" /> + <mkdir dir="${user.dir}/target/db" /> + + <ant antfile="src/main/resources/config-tool/build.xml" target="db.create" - inheritall="false" - dir="src/main/resources/config-tool"> + inheritall="false"> <property name="database" value="hsqldb.url" /> - <property name="jdbc.hsqldb.url" value="jdbc:hsqldb:file:../../../../target/deploy-artifacts/resources/hypersonic/Jbpm4DB" /> + <property name="jdbc.hsqldb.url" value="jdbc:hsqldb:file:target/db/Jbpm4DB" /> <property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-hsqldb-config" /> <property name="db.scripts.dir" value="${output.dir}/config.tool.tmp/hsqldb.scripts" /> <property name="tmp.dir" value="${output.dir}/config.tool.tmp" /> @@ -48,7 +51,7 @@ </ant> <sql driver="org.hsqldb.jdbcDriver" - url="jdbc:hsqldb:file:target/deploy-artifacts/resources/hypersonic/Jbpm4DB" + url="jdbc:hsqldb:file:target/db/Jbpm4DB" userid="sa" password="" onerror="continue"> @@ -60,6 +63,12 @@ </classpath> </sql> + <mkdir dir="${deploy.artifacts.dir}/resources/hsqldb" /> + <copy todir="${deploy.artifacts.dir}/resources/hsqldb"> + <fileset dir="${user.dir}/target/db" /> + </copy> + + <echo message="creating db configurations" /> <ant antfile="src/main/resources/config-tool/build.xml" target="create.db.scripts" inheritall="false"> <property name="database" value="hsqldb" /> @@ -88,8 +97,8 @@ <property name="tmp.dir" value="${output.dir}/config.tool.tmp" /> <property name="libs.dir" value="${deploy.artifacts.dir}/lib" /> </ant> - + <!-- the next copy depends on previous config-tool execution --> <mkdir dir="${deploy.artifacts.dir}/resources/datasources" /> <copy todir="${deploy.artifacts.dir}/resources/datasources"> Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml 2009-03-13 21:58:53 UTC (rev 4241) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml 2009-03-13 23:01:22 UTC (rev 4242) @@ -264,10 +264,10 @@ <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-hsqldb-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" condition="isHypersonic" /> - <fileset dir=&quot;(a){deploy.artifacts.dir}/resources&quot; - targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data" + <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/hsqldb&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data/hypersonic" condition="isHypersonic"> - <include name="hypersonic/Jbpm4DB.*" /> + <include name="Jbpm4DB.*" /> </fileset> <!-- Database MySQL --> Modified: jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties 2009-03-13 21:58:53 UTC (rev 4241) +++ jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties 2009-03-13 23:01:22 UTC (rev 4242) @@ -1,2 +1,2 @@ ## index of importer -> set(imports) -#Fri Mar 13 20:59:08 CET 2009 +#Fri Mar 13 23:53:42 CET 2009