[jbpm-commits] JBoss JBPM SVN: r3979 - in jbpm4/trunk/modules/jpdl: scripts and 1 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Feb 20 08:05:19 EST 2009
Author: heiko.braun at jboss.com
Date: 2009-02-20 08:05:19 -0500 (Fri, 20 Feb 2009)
New Revision: 3979
Added:
jbpm4/trunk/modules/jpdl/scripts/antrun-patch-hsql-properties.xml
Removed:
jbpm4/trunk/modules/jpdl/scripts/antrun-copy-resources.xml
Modified:
jbpm4/trunk/modules/jpdl/pom.xml
jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml
Log:
Create portable hsqdl DB file url
Modified: jbpm4/trunk/modules/jpdl/pom.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/pom.xml 2009-02-20 11:57:46 UTC (rev 3978)
+++ jbpm4/trunk/modules/jpdl/pom.xml 2009-02-20 13:05:19 UTC (rev 3979)
@@ -82,20 +82,21 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
- <execution>
+ <!--execution>
<id>ant-copy-resources</id>
- <phase>process-resources</phase>
+ <phase>process-classes</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
- <property name="build.dir" value="${project.build.directory}" />
- <property name="user.home" value="${user.home}" />
- <ant antfile="scripts/antrun-copy-resources.xml" target="copy" />
+ <property name="build.path.system" value="${project.build.directory}" />
+ <property name="from.dir" value="src/main/resources" />
+ <property name="to.dir" value="target/classes"/>
+ <ant antfile="scripts/antrun-patch-hsql-properties.xml" target="patch" />
</tasks>
</configuration>
- </execution>
+ </execution-->
<execution>
<phase>compile</phase>
<goals>
@@ -103,10 +104,18 @@
</goals>
<configuration>
<tasks>
+
+ <!-- Patch the Hsql DB Url to make it portable -->
+ <property name="build.path.system" value="${project.build.directory}" />
+ <property name="from.dir" value="${basedir}/src/main/resources" />
+ <property name="to.dir" value="${project.build.directory}/classes"/>
+ <ant antfile="scripts/antrun-patch-hsql-properties.xml" target="patch" />
+
<echo>============================</echo>
<echo>Database config: ${database}</echo>
<echo>============================</echo>
<property name="database" value="${database}" />
+ <property name="build.path.system" value="${project.build.directory}" />
<ant antfile="scripts/antrun-jbpm-config.xml" target="concat" />
</tasks>
</configuration>
Deleted: jbpm4/trunk/modules/jpdl/scripts/antrun-copy-resources.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/scripts/antrun-copy-resources.xml 2009-02-20 11:57:46 UTC (rev 3978)
+++ jbpm4/trunk/modules/jpdl/scripts/antrun-copy-resources.xml 2009-02-20 13:05:19 UTC (rev 3979)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id: antrun-jbpm-config.xml 3602 2009-01-08 04:27:48Z alex.guizar at jboss.com $ -->
-
-<project>
-
- <target name="copy">
-
- <!--makeurl file="${build.dir}" property="system.agnostic.path"/-->
-
- <path id="build.path">
- <pathelement location="${build.dir}"/>
- </path>
-
-
- <pathconvert targetos="unix" property="build.path.unix" refid="build.path">
- <!--map from="${build.dir}" to="${build.dir.unix}"/-->
- <map from="c:" to=""/>
- </pathconvert>
-
-
- <echo>***</echo>
- <echo>Build dir: ${build.path.unix} </echo>
- <echo>***</echo>
- </target>
-</project>
\ No newline at end of file
Copied: jbpm4/trunk/modules/jpdl/scripts/antrun-patch-hsql-properties.xml (from rev 3976, jbpm4/trunk/modules/jpdl/scripts/antrun-copy-resources.xml)
===================================================================
--- jbpm4/trunk/modules/jpdl/scripts/antrun-patch-hsql-properties.xml (rev 0)
+++ jbpm4/trunk/modules/jpdl/scripts/antrun-patch-hsql-properties.xml 2009-02-20 13:05:19 UTC (rev 3979)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id: antrun-jbpm-config.xml 3602 2009-01-08 04:27:48Z alex.guizar at jboss.com $ -->
+
+<project>
+
+ <path id="build.path">
+ <pathelement location="${build.path.system}"/>
+ </path>
+
+ <target name="patch">
+
+ <pathconvert targetos="unix" property="build.path.unix" refid="build.path"/>
+ <echo>DEBUG: Build path: ${build.path.unix} </echo>
+
+ <mkdir dir="${to.dir}"/>
+
+ <copy todir="${to.dir}" filtering="true" verbose="true" overwrite="true">
+ <filterset>
+ <filter token="project.build.directory" value="${build.path.unix}"/>
+ </filterset>
+ <fileset dir="${from.dir}">
+ <include name="**/hibernate.properties.hsqldb.xml"/>
+ </fileset>
+ </copy>
+
+ </target>
+</project>
\ No newline at end of file
Modified: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml 2009-02-20 11:57:46 UTC (rev 3978)
+++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml 2009-02-20 13:05:19 UTC (rev 3979)
@@ -4,7 +4,7 @@
<!-- JDBC connection properties (begin) -->
<property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property>
- <property name="hibernate.connection.url">jdbc:hsqldb:file:${project.build.directory}/hypersonic/jbpm4DB</property>
+ <property name="hibernate.connection.url">jdbc:hsqldb:file:@project.build.directory@/hypersonic/jbpm4DB</property>
<property name="hibernate.connection.username">sa</property>
<property name="hibernate.connection.password"></property>
<!-- JDBC connection properties (end) -->
More information about the jbpm-commits
mailing list