[jbpm-commits] JBoss JBPM SVN: r4292 - in jbpm4/trunk/modules/distro: scripts and 1 other directories.

[do-not-reply at jboss.org]

Author: heiko.braun at jboss.com
Date: 2009-03-19 07:10:14 -0400 (Thu, 19 Mar 2009)
New Revision: 4292

Modified:
   jbpm4/trunk/modules/distro/pom.xml
   jbpm4/trunk/modules/distro/scripts/antrun-installer.xml
   jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml
Log:
Pass runtime and test classpath to distro config tool

Modified: jbpm4/trunk/modules/distro/pom.xml
===================================================================
--- jbpm4/trunk/modules/distro/pom.xml	2009-03-19 09:48:55 UTC (rev 4291)
+++ jbpm4/trunk/modules/distro/pom.xml	2009-03-19 11:10:14 UTC (rev 4292)
@@ -193,7 +193,10 @@
             </goals>
             <configuration>
               <tasks>
+
+                <property name="maven.test.classpath" refid="maven.test.classpath" />
                 <property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
+
                 <property name="database" value="${database}" />
                 <property name="jboss.home" value="${jboss.home}" />
                 <property name="jboss422.home" value="${jboss422.home}" />

Modified: jbpm4/trunk/modules/distro/scripts/antrun-installer.xml
===================================================================
--- jbpm4/trunk/modules/distro/scripts/antrun-installer.xml	2009-03-19 09:48:55 UTC (rev 4291)
+++ jbpm4/trunk/modules/distro/scripts/antrun-installer.xml	2009-03-19 11:10:14 UTC (rev 4292)
@@ -42,6 +42,10 @@
     <ant antfile="src/main/resources/config-tool/build.xml" 
     	   target="db.create" 
     	   inheritall="false">
+
+      <property name="test_classpath" value="${maven.test.classpath}" />
+      <property name="runtime_classpath" value="${maven.runtime.classpath}" />
+      
       <property name="database" value="hsqldb.url" />
       <property name="jdbc.hsqldb.url" value="jdbc:hsqldb:file:target/db/jbpm4DB" />
       <property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-hsqldb-config" />
@@ -56,11 +60,16 @@
         password=""
         onerror="continue">
       <transaction>SHUTDOWN</transaction>
-      <classpath>
+
+      <classpath>        
+        <pathelement path="${maven.runtime.classpath}"/>
+      </classpath>
+      
+      <!--classpath>
         <fileset dir="${deploy.artifacts.dir}/lib">
           <include name="*.jar"/>
         </fileset>
-      </classpath>
+      </classpath-->
     </sql>
 
     <mkdir dir="${deploy.artifacts.dir}/resources/hsqldb" />

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:48:55 UTC (rev 4291)
+++ jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml	2009-03-19 11:10:14 UTC (rev 4292)
@@ -148,8 +148,6 @@
     <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}"