[jbpm-commits] JBoss JBPM SVN: r4291 - in jbpm4/trunk/modules: distro/src/main/resources/config-tool and 1 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Mar 19 05:48:55 EDT 2009
Author: heiko.braun at jboss.com
Date: 2009-03-19 05:48:55 -0400 (Thu, 19 Mar 2009)
New Revision: 4291
Modified:
jbpm4/trunk/modules/db/pom.xml
jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml
jbpm4/trunk/modules/test-db/pom.xml
Log:
Hudson integration: Avoid copying of jars in distro tool
Modified: jbpm4/trunk/modules/db/pom.xml
===================================================================
--- jbpm4/trunk/modules/db/pom.xml 2009-03-19 09:41:34 UTC (rev 4290)
+++ jbpm4/trunk/modules/db/pom.xml 2009-03-19 09:48:55 UTC (rev 4291)
@@ -52,7 +52,7 @@
</dependencies>
<profiles>
- <profile>
+ <!--profile>
<id>database</id>
<activation>
<property>
@@ -60,8 +60,7 @@
</property>
</activation>
<build>
- <plugins>
- <!-- Get Libs -->
+ <plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -80,7 +79,7 @@
</plugin>
</plugins>
</build>
- </profile>
+ </profile-->
<profile>
<id>drop-tables</id>
@@ -100,6 +99,11 @@
<ant antfile="../distro/src/main/resources/config-tool/build.xml"
target="db.drop"
inheritall="false">
+
+ <property name="compile_classpath" refid="maven.compile.classpath"/>
+ <property name="runtime_classpath" refid="maven.runtime.classpath"/>
+ <property name="test_classpath" refid="maven.test.classpath"/>
+
<property name="database" value="${database}" />
<property name="config.files.dir" value="${basedir}/target/config.tool/config.files" />
<property name="tmp.dir" value="${basedir}/target/config.tool/tmp" />
@@ -133,6 +137,11 @@
<ant antfile="../distro/src/main/resources/config-tool/build.xml"
target="db.create"
inheritall="false">
+
+ <property name="compile_classpath" refid="maven.compile.classpath"/>
+ <property name="runtime_classpath" refid="maven.runtime.classpath"/>
+ <property name="test_classpath" refid="maven.test.classpath"/>
+
<property name="database" value="${database}" />
<property name="config.files.dir" value="${basedir}/target/config.tool/config.files" />
<property name="tmp.dir" value="${basedir}/target/config.tool/tmp" />
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 09:41:34 UTC (rev 4290)
+++ jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml 2009-03-19 09:48:55 UTC (rev 4291)
@@ -147,17 +147,26 @@
<echo message="driver: ${hibernate.connection.driver_class}" />
<echo message="url: ${hibernate.connection.url}" />
<echo message="username: ${hibernate.connection.username}" />
+
+ <echo>Classpath: ${test_classpath}</echo>
+
<sql driver="${hibernate.connection.driver_class}"
url="${hibernate.connection.url}"
userid="${hibernate.connection.username}"
password="${hibernate.connection.password}"
onerror="continue">
<transaction src="${db.scripts.dir}/jbpm.${database}.create.sql"/>
- <classpath>
+
+ <classpath>
+ <pathelement path="${runtime_classpath}"/>
+ <pathelement path="${test_classpath}"/>
+ </classpath>
+
+ <!--classpath>
<fileset dir="${libs.dir}">
<include name="*.jar"/>
</fileset>
- </classpath>
+ </classpath-->
</sql>
</target>
@@ -170,11 +179,17 @@
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>
+
+ <!--classpath>
<fileset dir="${libs.dir}">
<include name="*.jar"/>
</fileset>
- </classpath>
+ </classpath-->
</sql>
</target>
Modified: jbpm4/trunk/modules/test-db/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-db/pom.xml 2009-03-19 09:41:34 UTC (rev 4290)
+++ jbpm4/trunk/modules/test-db/pom.xml 2009-03-19 09:48:55 UTC (rev 4291)
@@ -64,6 +64,11 @@
<tasks>
<echo>Overwriting db configuration for ${database}</echo>
<ant antfile="../distro/src/main/resources/config-tool/build.xml" target="create.configuration.files" inheritall="false">
+
+ <property name="compile_classpath" refid="maven.compile.classpath"/>
+ <property name="runtime_classpath" refid="maven.runtime.classpath"/>
+ <property name="test_classpath" refid="maven.test.classpath"/>
+
<property name="config.files.dir" value="${basedir}/target/test-classes" />
<property name="tmp.dir" value="${basedir}/target/config-tmp" />
<property name="database" value="${database}" />
More information about the jbpm-commits
mailing list